diff --git a/crates/pacdef_core/src/backend/actual/arch.rs b/crates/pacdef_core/src/backend/actual/arch.rs index 6e81fef..8fa57d0 100644 --- a/crates/pacdef_core/src/backend/actual/arch.rs +++ b/crates/pacdef_core/src/backend/actual/arch.rs @@ -6,7 +6,8 @@ use alpm::PackageReason::Explicit; use anyhow::{Context, Result}; use crate::backend::backend_trait::{Backend, Switches, Text}; -use crate::{impl_backend_constants, Group, Package}; +use crate::backend::macros::impl_backend_constants; +use crate::{Group, Package}; #[derive(Debug, Clone)] pub struct Arch { diff --git a/crates/pacdef_core/src/backend/actual/debian.rs b/crates/pacdef_core/src/backend/actual/debian.rs index eff57b8..b0b1574 100644 --- a/crates/pacdef_core/src/backend/actual/debian.rs +++ b/crates/pacdef_core/src/backend/actual/debian.rs @@ -7,7 +7,8 @@ use rust_apt::cache::PackageSort; use rust_apt::new_cache; use crate::backend::backend_trait::{Backend, Switches, Text}; -use crate::{impl_backend_constants, Group, Package}; +use crate::backend::macros::impl_backend_constants; +use crate::{Group, Package}; #[derive(Debug, Clone)] pub struct Debian { diff --git a/crates/pacdef_core/src/backend/actual/flatpak.rs b/crates/pacdef_core/src/backend/actual/flatpak.rs index 47bcf9e..845d122 100644 --- a/crates/pacdef_core/src/backend/actual/flatpak.rs +++ b/crates/pacdef_core/src/backend/actual/flatpak.rs @@ -5,7 +5,8 @@ use std::process::ExitStatus; use anyhow::{Context, Result}; use crate::backend::backend_trait::{Backend, Switches, Text}; -use crate::{impl_backend_constants, Group, Package}; +use crate::backend::macros::impl_backend_constants; +use crate::{Group, Package}; #[derive(Debug, Clone)] pub struct Flatpak { diff --git a/crates/pacdef_core/src/backend/actual/python.rs b/crates/pacdef_core/src/backend/actual/python.rs index 2472514..8ba3438 100644 --- a/crates/pacdef_core/src/backend/actual/python.rs +++ b/crates/pacdef_core/src/backend/actual/python.rs @@ -7,7 +7,8 @@ use anyhow::Result; use serde_json::Value; use crate::backend::backend_trait::{Backend, Switches, Text}; -use crate::{impl_backend_constants, Group, Package}; +use crate::backend::macros::impl_backend_constants; +use crate::{Group, Package}; #[derive(Debug, Clone)] pub struct Python { diff --git a/crates/pacdef_core/src/backend/actual/rust.rs b/crates/pacdef_core/src/backend/actual/rust.rs index 1ffc656..9e05609 100644 --- a/crates/pacdef_core/src/backend/actual/rust.rs +++ b/crates/pacdef_core/src/backend/actual/rust.rs @@ -7,7 +7,8 @@ use anyhow::{Context, Result}; use serde_json::Value; use crate::backend::backend_trait::{Backend, Switches, Text}; -use crate::{impl_backend_constants, Group, Package}; +use crate::backend::macros::impl_backend_constants; +use crate::{Group, Package}; #[derive(Debug, Clone)] pub struct Rust { diff --git a/crates/pacdef_core/src/backend/macros.rs b/crates/pacdef_core/src/backend/macros.rs index c8bf2ca..c2bf102 100644 --- a/crates/pacdef_core/src/backend/macros.rs +++ b/crates/pacdef_core/src/backend/macros.rs @@ -1,6 +1,5 @@ /// Used to implement parts of the `Backend` trait that should not change between the actual /// backends (boilerplate). -#[macro_export] macro_rules! impl_backend_constants { () => { fn get_binary_default(&self) -> Text { @@ -57,3 +56,5 @@ macro_rules! impl_backend_constants { } }; } + +pub(crate) use impl_backend_constants;