From 0d509fdfa62d702f7b8c9435e7c7677d4a4ff332 Mon Sep 17 00:00:00 2001 From: teackot Date: Tue, 16 May 2023 19:22:56 +0300 Subject: [PATCH] Remove the unnecessary flatpak feature flag --- Cargo.toml | 1 - crates/pacdef_core/Cargo.toml | 1 - crates/pacdef_core/src/backend/actual/mod.rs | 1 - crates/pacdef_core/src/backend/mod.rs | 1 - crates/pacdef_core/src/core.rs | 7 ++----- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4144687..9c5abcc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,4 +33,3 @@ strip = true default = [] debian = ["pacdef_core/debian"] arch = ["pacdef_core/arch"] -flatpak = ["pacdef_core/flatpak"] diff --git a/crates/pacdef_core/Cargo.toml b/crates/pacdef_core/Cargo.toml index 7eeb0e5..6609230 100644 --- a/crates/pacdef_core/Cargo.toml +++ b/crates/pacdef_core/Cargo.toml @@ -35,4 +35,3 @@ rust-apt = { version = "0.5", optional = true } default = [] arch = ["dep:alpm"] debian = ["dep:rust-apt"] -flatpak = [] diff --git a/crates/pacdef_core/src/backend/actual/mod.rs b/crates/pacdef_core/src/backend/actual/mod.rs index c8f8ba6..8c61e68 100644 --- a/crates/pacdef_core/src/backend/actual/mod.rs +++ b/crates/pacdef_core/src/backend/actual/mod.rs @@ -4,5 +4,4 @@ pub mod arch; pub mod debian; pub mod python; pub mod rust; -#[cfg(feature = "flatpak")] pub mod flatpak; diff --git a/crates/pacdef_core/src/backend/mod.rs b/crates/pacdef_core/src/backend/mod.rs index 19d6445..444d883 100644 --- a/crates/pacdef_core/src/backend/mod.rs +++ b/crates/pacdef_core/src/backend/mod.rs @@ -18,6 +18,5 @@ pub enum Backends { Debian, Python, Rust, - #[cfg(feature = "flatpak")] Flatpak, } diff --git a/crates/pacdef_core/src/core.rs b/crates/pacdef_core/src/core.rs index dcda504..ce62d13 100644 --- a/crates/pacdef_core/src/core.rs +++ b/crates/pacdef_core/src/core.rs @@ -129,11 +129,8 @@ impl Pacdef { } } - #[cfg(feature = "flatpak")] - { - if let Some(flatpak) = backend.as_any_mut().downcast_mut::() { - flatpak.systemwide = self.config.flatpak_systemwide; - } + if let Some(flatpak) = backend.as_any_mut().downcast_mut::() { + flatpak.systemwide = self.config.flatpak_systemwide; } }