Merge branch 'main' into force-skip-std

Author: cachebag

Cargo.lock

@@ -123,14 +123,14 @@ fn plus_toolchain_value_parser(s: &str) -> clap::error::Result<ResolvableToolcha
 #[command(name = "rustup", bin_name = "rustup[EXE]")]
 enum RustupSubcmd {
     /// Install or update the given toolchains, or by default the active toolchain
-    #[command(hide = true, after_help = install_help())]
+    #[command(after_help = install_help(), aliases = ["add"])]
     Install {
         #[command(flatten)]
         opts: UpdateOpts,
     },
 
     /// Uninstall the given toolchains
-    #[command(hide = true)]
+    #[command(aliases = ["remove", "rm", "delete", "del"])]
     Uninstall {
         #[command(flatten)]
         opts: UninstallOpts,
@@ -332,7 +332,7 @@ enum ToolchainSubcmd {
     },
 
     /// Install or update the given toolchains, or by default the active toolchain
-    #[command(aliases = ["update", "add"], after_help = toolchain_install_help())]
+    #[command(aliases = ["update", "up", "add"], after_help = toolchain_install_help())]
     Install {
         #[command(flatten)]
         opts: UpdateOpts,
@@ -386,6 +386,10 @@ struct UpdateOpts {
     #[arg(long)]
     no_self_update: bool,
 
+    /// Don't try to update the installed toolchain
+    #[arg(long)]
+    no_update: bool,
+
     /// Force an update, even if some components are missing
     #[arg(long)]
     force: bool,
@@ -537,6 +541,7 @@ enum OverrideSubcmd {
 )]
 enum SelfSubcmd {
     /// Download and install updates to rustup
+    #[command(alias = "up")]
     Update,
 
     /// Uninstall rustup
@@ -971,9 +976,13 @@ async fn update(
 
             let status = match DistributableToolchain::new(cfg, desc.clone()) {
                 Ok(d) => {
-                    InstallMethod::Dist(dist_opts.for_update(&d, opts.allow_downgrade))
-                        .install()
-                        .await?
+                    if !opts.no_update {
+                        InstallMethod::Dist(dist_opts.for_update(&d, opts.allow_downgrade))
+                            .install()
+                            .await?
+                    } else {
+                        UpdateStatus::Unchanged
+                    }
                 }
                 Err(RustupError::ToolchainNotInstalled { .. }) => {
                     DistributableToolchain::install(dist_opts).await?.0