Skip to content

Commit 7a5cb96

Browse files
committed
feat(config): warn user if auto-install is enabled
1 parent 5a30260 commit 7a5cb96

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

src/config.rs

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use anyhow::{Context, Result, anyhow, bail};
88
use serde::Deserialize;
99
use thiserror::Error as ThisError;
1010
use tokio_stream::StreamExt;
11-
use tracing::trace;
11+
use tracing::{info, trace, warn};
1212

1313
use crate::dist::AutoInstallMode;
1414
use crate::{
@@ -387,12 +387,26 @@ impl<'a> Cfg<'a> {
387387
}
388388

389389
pub(crate) fn should_auto_install(&self) -> Result<bool> {
390-
if let Ok(mode) = self.process.var("RUSTUP_AUTO_INSTALL") {
391-
Ok(mode != "0")
392-
} else {
393-
self.settings_file
394-
.with(|s| Ok(s.auto_install != Some(AutoInstallMode::Disable)))
390+
let res = match self.process.var("RUSTUP_AUTO_INSTALL") {
391+
Ok(mode) => mode != "0",
392+
Err(_) => self
393+
.settings_file
394+
.with(|s| Ok(s.auto_install != Some(AutoInstallMode::Disable)))?,
395+
};
396+
if res
397+
// We also need to suppress this warning if we're deep inside a recursive call.
398+
&& matches!(
399+
self.process.var("RUST_RECURSION_COUNT").as_deref(),
400+
Err(_) | Ok("0"),
401+
)
402+
{
403+
warn!("auto-install is enabled, active toolchain will be installed if absent");
404+
warn!("this behavior is deprecated and will be removed in a future version");
405+
info!(
406+
"you may opt out now with `RUSTUP_AUTO_INSTALL=0` or `rustup set auto-install disable`"
407+
);
395408
}
409+
Ok(res)
396410
}
397411

398412
// Returns a profile, if one exists in the settings file.

0 commit comments

Comments
 (0)