Remove Cargo feature indirection

Author: djc

src/cli/rustup_mode.rs

@@ -834,7 +834,7 @@ async fn check_updates(cfg: &Cfg<'_>, opts: CheckOpts) -> Result<utils::ExitCode
     // Check for update only if rustup does **not** have the no-self-update feature,
     // and auto-self-update is configured to **enable**
     // and has **no** no-self-update parameter.
-    let self_update = !self_update::NEVER_SELF_UPDATE
+    let self_update = !cfg!(feature = "no-self-update")
         && self_update_mode == SelfUpdateMode::Enable
         && !opts.no_self_update;
 
@@ -859,7 +859,7 @@ async fn update(
     // Update only if rustup does **not** have the no-self-update feature,
     // and auto-self-update is configured to **enable**
     // and has **no** no-self-update parameter.
-    let self_update = !self_update::NEVER_SELF_UPDATE
+    let self_update = !cfg!(feature = "no-self-update")
         && self_update_mode == SelfUpdateMode::Enable
         && !opts.no_self_update;
     let force_non_host = opts.force_non_host;
@@ -936,11 +936,11 @@ async fn update(
         cfg.tmp_cx.clean();
     }
 
-    if !self_update::NEVER_SELF_UPDATE && self_update_mode == SelfUpdateMode::CheckOnly {
+    if !cfg!(feature = "no-self-update") && self_update_mode == SelfUpdateMode::CheckOnly {
         check_rustup_update(cfg.process).await?;
     }
 
-    if self_update::NEVER_SELF_UPDATE {
+    if cfg!(feature = "no-self-update") {
         info!("self-update is disabled for this build of rustup");
         info!("any updates to rustup will need to be fetched with your system package manager")
     }
@@ -1714,7 +1714,7 @@ fn set_auto_self_update(
     cfg: &mut Cfg<'_>,
     auto_self_update_mode: SelfUpdateMode,
 ) -> Result<utils::ExitCode> {
-    if self_update::NEVER_SELF_UPDATE {
+    if cfg!(feature = "no-self-update") {
         let mut args = cfg.process.args_os();
         let arg0 = args.next().map(PathBuf::from);
         let arg0 = arg0

src/cli/self_update.rs

@@ -246,11 +246,6 @@ impl InstallOpts<'_> {
     }
 }
 
-#[cfg(feature = "no-self-update")]
-pub(crate) const NEVER_SELF_UPDATE: bool = true;
-#[cfg(not(feature = "no-self-update"))]
-pub(crate) const NEVER_SELF_UPDATE: bool = false;
-
 #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum SelfUpdateMode {
@@ -955,7 +950,7 @@ async fn maybe_install_rust(
 }
 
 pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::ExitCode> {
-    if NEVER_SELF_UPDATE {
+    if cfg!(feature = "no-self-update") {
         error!("self-uninstall is disabled for this build of rustup");
         error!("you should probably use your system package manager to uninstall rustup");
         return Ok(utils::ExitCode(1));
@@ -1073,7 +1068,7 @@ pub(crate) async fn update(cfg: &Cfg<'_>) -> Result<utils::ExitCode> {
     common::warn_if_host_is_emulated(cfg.process);
 
     use common::SelfUpdatePermission::*;
-    let update_permitted = if NEVER_SELF_UPDATE {
+    let update_permitted = if cfg!(feature = "no-self-update") {
         HardFail
     } else {
         common::self_update_permitted(true)?