chore!: re-merge oma-mirror to aosc feature (#573)

Author: eatradish

Cargo.toml

@@ -74,15 +74,14 @@ rust-embed = "8.5.0"
 
 [features]
 aosc = ["dep:oma-topics", "oma-refresh/aosc", "oma-pm/aosc", "oma-contents/aosc", "dep:oma-mirror", "reqwest/blocking", "dep:oma-tum"]
-mirror = []
 sequoia-openssl-backend = ["oma-refresh/sequoia-openssl-backend"]
 sequoia-nettle-backend = ["oma-refresh/sequoia-nettle-backend"]
 tokio-console = ["dep:console-subscriber"]
 rustls = ["reqwest/rustls-tls", "oma-fetch/rustls", "oma-refresh/rustls", "oma-topics/rustls"]
 openssl = ["reqwest/native-tls", "oma-fetch/native-tls", "oma-refresh/native-tls", "oma-topics/native-tls"]
 nice-setup = ["sequoia-nettle-backend", "rustls", "oma-refresh/apt"]
 openssl-setup = ["sequoia-openssl-backend", "openssl", "oma-refresh/apt"]
-default = ["aosc", "nice-setup", "mirror"]
+default = ["aosc", "nice-setup"]
 
 [workspace]
 members = ["oma-contents", "oma-console", "oma-topics", "oma-fetch", "oma-refresh", "oma-utils", "oma-pm", "oma-history", "oma-pm-operation-type", "oma-repo-verify", "oma-mirror", "apt-auth-config", "oma-tum"]

src/args.rs

@@ -199,7 +199,7 @@ pub enum SubCmd {
     #[command(visible_alias = "topic", about = fl!("clap-topics-help"), help_template = &*HELP_TEMPLATE)]
     #[command(next_help_heading = &**crate::args::ARG_HELP_HEADING)]
     Topics(Topics),
-    #[cfg(feature = "mirror")]
+    #[cfg(feature = "aosc")]
     /// Manage Mirrors enrollment
     #[command(visible_alias = "mirrors", about = fl!("clap-mirror-help"), help_template = &*HELP_TEMPLATE)]
     #[command(next_help_heading = &**crate::args::ARG_HELP_HEADING)]

src/subcommand/mirror.rs

@@ -223,7 +223,6 @@ impl CliExecuter for CliMirror {
                 ),
                 MirrorSubCmd::Speedtest {
                     set_fastest,
-                    #[cfg(feature = "aosc")]
                     no_refresh_topics,
                     no_refresh,
                     timeout,

src/subcommand/mod.rs

@@ -9,7 +9,7 @@ pub mod history;
 pub mod install;
 pub mod list;
 pub mod mark;
-#[cfg(feature = "mirror")]
+#[cfg(feature = "aosc")]
 pub mod mirror;
 pub mod pick;
 pub mod rdepends;