From d14894253a2cd92ec79fbb88071e897a44659e84 Mon Sep 17 00:00:00 2001 From: timeshifter Date: Thu, 12 Jan 2023 23:18:17 +0100 Subject: [PATCH] remove backend/types --- src/backend/backend_trait.rs | 3 ++- src/backend/mod.rs | 1 - src/backend/pacman.rs | 3 +-- src/backend/rust.rs | 3 +-- src/backend/types.rs | 2 -- 5 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/backend/types.rs diff --git a/src/backend/backend_trait.rs b/src/backend/backend_trait.rs index d851796..2606cbb 100644 --- a/src/backend/backend_trait.rs +++ b/src/backend/backend_trait.rs @@ -6,7 +6,8 @@ use anyhow::{Context, Result}; use crate::{Group, Package}; -use super::types::{Switches, Text}; +pub(in crate::backend) type Switches = &'static [&'static str]; +pub(in crate::backend) type Text = &'static str; pub(crate) trait Backend { fn get_binary(&self) -> Text; diff --git a/src/backend/mod.rs b/src/backend/mod.rs index 3df36a1..e7b3b72 100644 --- a/src/backend/mod.rs +++ b/src/backend/mod.rs @@ -4,7 +4,6 @@ mod macros; mod pacman; mod rust; mod todo_per_backend; -mod types; pub(crate) use backend_trait::Backend; pub(crate) use iter::BackendIter; diff --git a/src/backend/pacman.rs b/src/backend/pacman.rs index 3781686..96beeed 100644 --- a/src/backend/pacman.rs +++ b/src/backend/pacman.rs @@ -4,8 +4,7 @@ use alpm::Alpm; use alpm::PackageReason::Explicit; use anyhow::{Context, Result}; -use super::types::{Switches, Text}; -use super::Backend; +use super::backend_trait::*; use crate::{impl_backend_constants, Group, Package}; pub(crate) struct Pacman { diff --git a/src/backend/rust.rs b/src/backend/rust.rs index fea1624..e3c7334 100644 --- a/src/backend/rust.rs +++ b/src/backend/rust.rs @@ -5,8 +5,7 @@ use std::path::PathBuf; use anyhow::{Context, Result}; use serde_json::Value; -use super::types::{Switches, Text}; -use super::Backend; +use super::backend_trait::*; use crate::{impl_backend_constants, Group, Package}; pub(crate) struct Rust { diff --git a/src/backend/types.rs b/src/backend/types.rs deleted file mode 100644 index 740e9e2..0000000 --- a/src/backend/types.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub(in crate::backend) type Switches = &'static [&'static str]; -pub(in crate::backend) type Text = &'static str;