feat(config)!: remove implicit installation from resolve_local_toolchain()

Author: rami3l

src/config.rs

@@ -731,8 +731,13 @@ impl<'a> Cfg<'a> {
             .transpose()?;
 
         Ok(match local {
-            Some(tc) => Toolchain::from_local(tc, false, self).await?,
-            None => self.find_or_install_active_toolchain(false).await?.0,
+            Some(tc) => Toolchain::new(self, tc)?,
+            None => Toolchain::new(
+                self,
+                self.find_active_toolchain()?
+                    .ok_or_else(|| no_toolchain_error(self.process))?
+                    .0,
+            )?,
         })
     }
 

tests/suite/cli_rustup.rs

@@ -2133,7 +2133,7 @@ async fn file_override_toml_format_install_both_toolchain_and_components() {
         cx.config.expect_ok(&["rustup", "default", "stable"]).await;
     }
 
-    let cx = cx.with_dist_dir(Scenario::ArchivesV2_2015_01_01);
+    let mut cx = cx.with_dist_dir(Scenario::ArchivesV2_2015_01_01);
     cx.config
         .expect_stdout_ok(&["rustc", "--version"], "hash-stable-1.1.0")
         .await;
@@ -2153,6 +2153,9 @@ components = [ "rust-src" ]
     )
     .unwrap();
 
+    cx.config
+        .expect_ok(&["rustup", "toolchain", "install"])
+        .await;
     cx.config
         .expect_stdout_ok(&["rustc", "--version"], "hash-nightly-1")
         .await;
@@ -2233,7 +2236,7 @@ components = [ "rust-bongo" ]
 
     cx.config
         .expect_stderr_ok(
-            &["rustc", "--version"],
+            &["rustup", "toolchain", "install"],
             "warn: Force-skipping unavailable component 'rust-bongo",
         )
         .await;
@@ -2789,7 +2792,7 @@ async fn dont_warn_on_partial_build() {
 /// Checks that `rust-toolchain.toml` files are considered
 #[tokio::test]
 async fn rust_toolchain_toml() {
-    let cx = CliTestContext::new(Scenario::SimpleV2).await;
+    let mut cx = CliTestContext::new(Scenario::SimpleV2).await;
     cx.config
         .expect_err(
             &["rustc", "--version"],
@@ -2800,7 +2803,9 @@ async fn rust_toolchain_toml() {
     let cwd = cx.config.current_dir();
     let toolchain_file = cwd.join("rust-toolchain.toml");
     raw::write_file(&toolchain_file, "[toolchain]\nchannel = \"nightly\"").unwrap();
-
+    cx.config
+        .expect_ok(&["rustup", "toolchain", "install"])
+        .await;
     cx.config
         .expect_stdout_ok(&["rustc", "--version"], "hash-nightly-2")
         .await;
@@ -2831,7 +2836,7 @@ async fn warn_on_duplicate_rust_toolchain_file() {
 
     cx.config
         .expect_stderr_ok(
-            &["rustc", "--version"],
+            &["rustup", "toolchain", "install"],
             &format!(
                 "warn: both `{0}` and `{1}` exist. Using `{0}`",
                 toolchain_file_1.canonicalize().unwrap().display(),

tests/suite/cli_v1.rs

@@ -169,18 +169,6 @@ async fn remove_toolchain() {
         .await;
 }
 
-#[tokio::test]
-async fn remove_default_toolchain_autoinstalls() {
-    let mut cx = CliTestContext::new(Scenario::SimpleV1).await;
-    cx.config.expect_ok(&["rustup", "default", "nightly"]).await;
-    cx.config
-        .expect_ok(&["rustup", "toolchain", "remove", "nightly"])
-        .await;
-    cx.config
-        .expect_stderr_ok(&["rustc", "--version"], "info: installing component")
-        .await;
-}
-
 #[tokio::test]
 async fn remove_override_toolchain_err_handling() {
     let mut cx = CliTestContext::new(Scenario::SimpleV1).await;
@@ -194,7 +182,15 @@ async fn remove_override_toolchain_err_handling() {
         .expect_ok(&["rustup", "toolchain", "remove", "beta"])
         .await;
     cx.config
-        .expect_stderr_ok(&["rustc", "--version"], "info: installing component")
+        .expect_err_ex(
+            &["rustc", "--version"],
+            "",
+            for_host!(
+                r"error: toolchain 'beta-{0}' is not installed
+help: run `rustup toolchain install beta-{0}` to install it
+"
+            ),
+        )
         .await;
 }
 

tests/suite/cli_v2.rs

@@ -311,18 +311,6 @@ async fn add_remove_multiple_toolchains() {
     }
 }
 
-#[tokio::test]
-async fn remove_default_toolchain_autoinstalls() {
-    let mut cx = CliTestContext::new(Scenario::SimpleV2).await;
-    cx.config.expect_ok(&["rustup", "default", "nightly"]).await;
-    cx.config
-        .expect_ok(&["rustup", "toolchain", "remove", "nightly"])
-        .await;
-    cx.config
-        .expect_stderr_ok(&["rustc", "--version"], "info: installing component")
-        .await;
-}
-
 #[tokio::test]
 async fn remove_override_toolchain_err_handling() {
     let mut cx = CliTestContext::new(Scenario::SimpleV2).await;
@@ -336,7 +324,15 @@ async fn remove_override_toolchain_err_handling() {
         .expect_ok(&["rustup", "toolchain", "remove", "beta"])
         .await;
     cx.config
-        .expect_stderr_ok(&["rustc", "--version"], "info: installing component")
+        .expect_err_ex(
+            &["rustc", "--version"],
+            "",
+            for_host!(
+                r"error: toolchain 'beta-{0}' is not installed
+help: run `rustup toolchain install beta-{0}` to install it
+"
+            ),
+        )
         .await;
 }
 
@@ -347,7 +343,10 @@ async fn file_override_toolchain_err_handling() {
     let toolchain_file = cwd.join("rust-toolchain");
     rustup::utils::raw::write_file(&toolchain_file, "beta").unwrap();
     cx.config
-        .expect_stderr_ok(&["rustc", "--version"], "info: installing component")
+        .expect_err(
+            &["rustc", "--version"],
+            for_host!("toolchain 'beta-{0}' is not installed"),
+        )
         .await;
 }
 
@@ -423,12 +422,6 @@ async fn bad_manifest() {
             &format!("error: could not parse manifest file: '{}'", path.display()),
         )
         .await;
-    cx.config
-        .expect_err(
-            &["cargo", "--help"],
-            &format!("error: could not parse manifest file: '{}'", path.display()),
-        )
-        .await;
 }
 
 #[tokio::test]