Implement 11036 cargo changes

Author: smoelius

src/cargo/ops/cargo_install.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::{env, fs};
+use std::{env, fmt, fs};
 
 use crate::core::compiler::{CompileKind, DefaultExecutor, Executor, UnitOutput};
 use crate::core::{Dependency, Edition, Package, PackageId, SourceId, Target, Workspace};
@@ -14,6 +14,7 @@ use crate::util::errors::CargoResult;
 use crate::util::{Filesystem, GlobalContext, Rustc};
 use crate::{drop_println, ops};
 
+use annotate_snippets::Level;
 use anyhow::{Context as _, bail};
 use cargo_util::paths;
 use cargo_util_schemas::core::PartialVersion;
@@ -39,6 +40,55 @@ impl Drop for Transaction {
     }
 }
 
+enum RustupToolchainSource {
+    Default,
+    Environment,
+    CommandLine,
+    OverrideDB,
+    ToolchainFile,
+    Other(String),
+}
+
+#[allow(dead_code)]
+impl RustupToolchainSource {
+    fn is_default(&self) -> bool {
+        matches!(self, Self::Default)
+    }
+
+    fn is_environment_override(&self) -> bool {
+        matches!(self, Self::Environment)
+    }
+
+    fn is_command_line_override(&self) -> bool {
+        matches!(self, Self::CommandLine)
+    }
+
+    fn is_current_dir_override(&self) -> bool {
+        matches!(self, Self::OverrideDB)
+    }
+
+    fn is_toolchain_file_override(&self) -> bool {
+        matches!(self, Self::ToolchainFile)
+    }
+
+    fn is_other_override(&self) -> bool {
+        matches!(self, Self::Other(_))
+    }
+}
+
+impl fmt::Display for RustupToolchainSource {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(match self {
+            Self::Default => "default",
+            Self::Environment => "env",
+            Self::CommandLine => "cli",
+            Self::OverrideDB => "path-override",
+            Self::ToolchainFile => "toolchain-file",
+            Self::Other(other) => other,
+        })
+    }
+}
+
 struct InstallablePackage<'gctx> {
     gctx: &'gctx GlobalContext,
     opts: ops::CompileOptions,
@@ -316,6 +366,25 @@ impl<'gctx> InstallablePackage<'gctx> {
     fn install_one(mut self, dry_run: bool) -> CargoResult<bool> {
         self.gctx.shell().status("Installing", &self.pkg)?;
 
+        if let Some(source) = self.get_rustup_toolchain_source()
+            && !source.is_default()
+            && !source.is_command_line_override()
+        {
+            #[allow(clippy::disallowed_methods)]
+            let maybe_toolchain = env::var("RUSTUP_TOOLCHAIN")
+                .ok()
+                .map(|toolchain| format!(" `{toolchain}`"))
+                .unwrap_or_default();
+            let report = &[Level::WARNING
+                .secondary_title(format!(
+                    "using non-default toolchain{maybe_toolchain} overridden by {source}"
+                ))
+                .element(Level::HELP.message(format!(
+                    "use `cargo +stable install` if you meant to use the stable toolchain."
+                )))];
+            self.gctx.shell().print_report(report, false)?;
+        }
+
         // Normalize to absolute path for consistency throughout.
         // See: https://github.com/rust-lang/cargo/issues/16023
         let dst = self.root.join("bin").into_path_unlocked();
@@ -593,6 +662,20 @@ impl<'gctx> InstallablePackage<'gctx> {
         }
     }
 
+    fn get_rustup_toolchain_source(&self) -> Option<RustupToolchainSource> {
+        #[allow(clippy::disallowed_methods)]
+        let source = std::env::var("RUSTUP_TOOLCHAIN_SOURCE").ok()?;
+        let source = match source.as_str() {
+            "default" => RustupToolchainSource::Default,
+            "env" => RustupToolchainSource::Environment,
+            "cli" => RustupToolchainSource::CommandLine,
+            "path-override" => RustupToolchainSource::OverrideDB,
+            "toolchain-file" => RustupToolchainSource::ToolchainFile,
+            other => RustupToolchainSource::Other(other.to_owned()),
+        };
+        Some(source)
+    }
+
     fn check_yanked_install(&self) -> CargoResult<()> {
         if self.ws.ignore_lock() || !self.ws.root().join("Cargo.lock").exists() {
             return Ok(());

tests/testsuite/rustup.rs

@@ -329,31 +329,31 @@ fn cargo_install_with_toolchain_source_cli() {
 fn cargo_install_with_toolchain_source_env() {
     cargo_install_with_toolchain_source(
         Some("env"),
-        &warning_with_optional_rust_toolchain_source(None),
+        &warning_with_optional_rust_toolchain_source(Some("env")),
     );
 }
 
 #[cargo_test]
 fn cargo_install_with_toolchain_source_path_override() {
     cargo_install_with_toolchain_source(
         Some("path-override"),
-        &warning_with_optional_rust_toolchain_source(None),
+        &warning_with_optional_rust_toolchain_source(Some("path-override")),
     );
 }
 
 #[cargo_test]
 fn cargo_install_with_toolchain_source_toolchain_file() {
     cargo_install_with_toolchain_source(
         Some("toolchain-file"),
-        &warning_with_optional_rust_toolchain_source(None),
+        &warning_with_optional_rust_toolchain_source(Some("toolchain-file")),
     );
 }
 
 #[cargo_test]
 fn cargo_install_with_toolchain_source_unrecognized() {
     cargo_install_with_toolchain_source(
         Some("unrecognized"),
-        &warning_with_optional_rust_toolchain_source(None),
+        &warning_with_optional_rust_toolchain_source(Some("unrecognized")),
     );
 }