Skip to content

Commit 36e5909

Browse files
committed
fixup! feat(config): warn user if auto-install is enabled
1 parent fedd51c commit 36e5909

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/test/clitools.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ impl Config {
277277
"/bogus-config-file.toml",
278278
);
279279

280+
// Clear current recursion count to avoid messing up related logic
281+
cmd.env("RUST_RECURSION_COUNT", "");
282+
280283
// Disable auto installation of active toolchain unless explicitly requested
281284
cmd.env("RUSTUP_AUTO_INSTALL", "0");
282285

tests/suite/cli_misc.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,11 +1756,7 @@ async fn warn_auto_install() {
17561756
cx.config
17571757
.expect_with_env(
17581758
["rustc", "--version"],
1759-
[
1760-
("RUSTUP_TOOLCHAIN", "stable"),
1761-
("RUSTUP_AUTO_INSTALL", "1"),
1762-
("RUST_RECURSION_COUNT", ""),
1763-
],
1759+
[("RUSTUP_TOOLCHAIN", "stable"), ("RUSTUP_AUTO_INSTALL", "1")],
17641760
)
17651761
.await
17661762
.with_stdout(snapbox::str![[r#"

0 commit comments

Comments
 (0)