Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cli/help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ pub(crate) fn resolvable_toolchain_arg_help() -> &'static str {
'1.8.0', or a custom toolchain name. For more information see `rustup \
help toolchain`"
}
pub(crate) fn maybe_resolvable_toolchain_arg_help() -> &'static str {
pub(crate) fn default_toolchain_arg_help() -> &'static str {
"'none', a toolchain name, such as 'stable', 'nightly', \
'1.8.0', or a custom toolchain name. For more information see `rustup \
help toolchain`"
Expand Down
84 changes: 50 additions & 34 deletions src/cli/rustup_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ use crate::{
completions, docs,
errors::CliError,
help::{
check_help, completions_help, default_help, doc_help, install_help,
maybe_resolvable_toolchain_arg_help, official_toolchain_arg_help, override_help,
override_unset_help, resolvable_local_toolchain_arg_help,
resolvable_toolchain_arg_help, run_help, rustup_help, show_active_toolchain_help,
show_help, toolchain_help, toolchain_install_help, toolchain_link_help, topic_arg_help,
update_help,
check_help, completions_help, default_help, default_toolchain_arg_help, doc_help,
install_help, official_toolchain_arg_help, override_help, override_unset_help,
resolvable_local_toolchain_arg_help, resolvable_toolchain_arg_help, run_help,
rustup_help, show_active_toolchain_help, show_help, toolchain_help,
toolchain_install_help, toolchain_link_help, topic_arg_help, update_help,
},
self_update::{self, SelfUpdateMode, check_rustup_update},
},
Expand All @@ -52,9 +51,8 @@ use crate::{
install::{InstallMethod, UpdateStatus},
process::{ColorableTerminal, Process},
toolchain::{
ChannelToolchain, CustomToolchainName, MaybePartialToolchainName, Override,
PartialToolchainName, PartialToolchainNameOrPath, Toolchain, ToolchainName,
ToolchainNameOrPath,
ChannelToolchain, CustomToolchainName, Override, PartialToolchainName,
PartialToolchainNameOrPath, Toolchain, ToolchainName, ToolchainNameOrPath,
},
utils::{self, ExitCode},
};
Expand Down Expand Up @@ -155,8 +153,8 @@ enum RustupSubcmd {
/// Set the default toolchain
#[command(after_help = default_help())]
Default {
#[arg(help = maybe_resolvable_toolchain_arg_help())]
toolchain: Option<Override<MaybePartialToolchainName>>,
#[arg(help = default_toolchain_arg_help())]
toolchain: Option<DefaultToolchain>,

/// Install toolchains that require an emulator. See https://github.com/rust-lang/rustup/wiki/Non-host-toolchains
#[arg(long)]
Expand Down Expand Up @@ -316,6 +314,24 @@ fn update_toolchain_value_parser(s: &str) -> anyhow::Result<PartialChannelToolch
})
}

/// User input to be set as the default toolchain.
///
/// A value of "none" will be parsed into `Self(None)` which means that the user has requested to
/// unset the default toolchain.
#[derive(Debug, Clone)]
struct DefaultToolchain(Option<Override<PartialToolchainName>>);

impl FromStr for DefaultToolchain {
type Err = Error;

fn from_str(value: &str) -> Result<Self, Self::Err> {
Ok(Self(match value.trim_end_matches('/') {
"none" => None,
_ => Some(Override::from_str(value)?),
}))
}
}

impl RustupSubcmd {
fn allow_auto_install(&self) -> bool {
match self {
Expand Down Expand Up @@ -900,21 +916,27 @@ pub async fn main(

async fn default_(
cfg: &Cfg<'_>,
toolchain: Option<Override<MaybePartialToolchainName>>,
toolchain: Option<DefaultToolchain>,
force_non_host: bool,
) -> anyhow::Result<ExitCode> {
common::warn_if_host_is_emulated(cfg.process);

if let Some(toolchain) = toolchain {
match toolchain.resolve(cfg)? {
MaybePartialToolchainName::None => {
cfg.set_default(None)?;
}
MaybePartialToolchainName::Some(PartialToolchainName::Custom(toolchain_name)) => {
let Some(toolchain) = toolchain else {
let default_toolchain = cfg
.get_default()?
.ok_or_else(|| anyhow!("no default toolchain is configured"))?;
writeln!(cfg.process.stdout().lock(), "{default_toolchain} (default)")?;
return Ok(ExitCode::SUCCESS);
};

match toolchain.0 {
None => cfg.set_default(None)?,
Some(toolchain) => match toolchain.resolve(cfg)? {
PartialToolchainName::Custom(toolchain_name) => {
Toolchain::new(cfg, toolchain_name.clone().into())?;
cfg.set_default(Some(&toolchain_name.into()))?;
}
MaybePartialToolchainName::Some(PartialToolchainName::Channel(toolchain)) => {
PartialToolchainName::Channel(toolchain) => {
let desc = toolchain.clone().complete(&cfg.default_host_tuple()?)?;
let status = cfg
.ensure_installed(&desc, vec![], vec![], None, force_non_host, true)
Expand All @@ -927,23 +949,17 @@ async fn default_(

common::show_channel_update(cfg, PackageUpdate::Toolchain(desc), Ok(status))?;
}
};

if let Some((toolchain, source)) = cfg.active_toolchain()?
&& !matches!(source, ActiveSource::Default)
{
info!(
"note that the toolchain '{toolchain}' is currently in use ({})",
source.to_reason()
);
}
} else {
let default_toolchain = cfg
.get_default()?
.ok_or_else(|| anyhow!("no default toolchain is configured"))?;
writeln!(cfg.process.stdout().lock(), "{default_toolchain} (default)")?;
},
}

if let Some((toolchain, source)) = cfg.active_toolchain()?
&& !matches!(source, ActiveSource::Default)
{
info!(
"note that the toolchain '{toolchain}' is currently in use ({})",
source.to_reason()
);
}
Ok(ExitCode::SUCCESS)
}

Expand Down
60 changes: 34 additions & 26 deletions src/cli/self_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@
//! Deleting the running binary during uninstall is tricky
//! and racy on Windows.

#[cfg(unix)]
use std::borrow::Cow;
use std::{
borrow::Cow,
env::{self, consts::EXE_SUFFIX},
fmt, fs,
io::{self, Write},
Expand Down Expand Up @@ -68,10 +67,7 @@ use crate::{
install::{InstallMethod, UpdateStatus},
process::Process,
settings::SettingsFile,
toolchain::{
ChannelToolchain, MaybeChannelToolchainName, PartialToolchainName, Toolchain,
ToolchainNameExt as _,
},
toolchain::{ChannelToolchain, PartialToolchainName, Toolchain, ToolchainNameExt as _},
utils::{self, ExitCode},
};

Expand Down Expand Up @@ -107,9 +103,9 @@ use windows::{
run_update,
};

pub(crate) struct InstallOpts<'a> {
pub(super) struct InstallOpts<'a> {
pub default_host_tuple: Option<String>,
pub default_toolchain: Option<MaybeChannelToolchainName>,
pub default_toolchain: Option<DefaultChannelToolchain>,
pub profile: Profile,
pub no_modify_path: bool,
pub no_update_toolchain: bool,
Expand Down Expand Up @@ -338,7 +334,7 @@ impl InstallOpts<'_> {
// a toolchain (updating if it's already present) and then if neither of
// those are true, we have a user who doesn't mind, and already has an
// install, so we leave their setup alone.
if matches!(default_toolchain, Some(MaybeChannelToolchainName::None)) {
if matches!(default_toolchain, Some(DefaultChannelToolchain(None))) {
info!("skipping toolchain installation");
if !components.is_empty() {
warn!(
Expand All @@ -360,13 +356,7 @@ impl InstallOpts<'_> {
|| (!no_update_toolchain && cfg.find_default()?.is_none())
{
Ok(match default_toolchain {
Some(s) => {
let toolchain_name = match s {
MaybeChannelToolchainName::None => unreachable!(),
MaybeChannelToolchainName::Some(n) => n,
};
Some(toolchain_name)
}
Some(s) => Some(s.0.unwrap()),
None => match cfg.get_default_resolvable()? {
// Default is installable
Some(PartialToolchainName::Channel(t)) => Some(t),
Expand Down Expand Up @@ -401,11 +391,12 @@ impl InstallOpts<'_> {
process,
)?);

self.default_toolchain = Some(MaybeChannelToolchainName::from_str(&common::question_str(
self.default_toolchain = Some(DefaultChannelToolchain::from_str(&common::question_str(
"Default toolchain? (stable/beta/nightly/none)",
&match &self.default_toolchain {
Some(name) => name.to_string(),
None => "stable".to_owned(),
Some(DefaultChannelToolchain(Some(t))) => Cow::Owned(t.to_string()),
Some(DefaultChannelToolchain(None)) => Cow::Borrowed("none"),
None => Cow::Borrowed("stable"),
},
process,
)?)?);
Expand Down Expand Up @@ -433,11 +424,9 @@ impl InstallOpts<'_> {
.as_ref()
.map(TargetTuple::new)
.unwrap_or_else(|| TargetTuple::from_host_or_build(process));
let partial_channel = match &self.default_toolchain {
None | Some(MaybeChannelToolchainName::None) => {
PartialToolchainName::from_str("stable")?
}
Some(MaybeChannelToolchainName::Some(s)) => s.into(),
let partial_channel = match self.default_toolchain.as_ref().and_then(|t| t.0.as_ref()) {
None => PartialToolchainName::from_str("stable")?,
Some(s) => s.into(),
};
let resolved = partial_channel.complete(&host_tuple)?;
trace!("Successfully resolved installation toolchain as: {resolved}");
Expand All @@ -458,15 +447,34 @@ impl InstallOpts<'_> {
TargetTuple::new,
),
match &self.default_toolchain {
Some(name) => name.to_string(),
None => "stable (default)".to_owned(),
Some(DefaultChannelToolchain(Some(name))) => Cow::Owned(name.to_string()),
Some(DefaultChannelToolchain(None)) => Cow::Borrowed("none"),
None => Cow::Borrowed("stable (default)"),
},
self.profile,
if !self.no_modify_path { "yes" } else { "no" }
)
}
}

/// User input to be set as the default channel toolchain.
///
/// A value of "none" will be parsed into `Self(None)` which means that the user has requested to
/// unset the default toolchain.
#[derive(Debug, Clone)]
pub(super) struct DefaultChannelToolchain(Option<PartialChannelToolchainName>);

impl FromStr for DefaultChannelToolchain {
type Err = anyhow::Error;

fn from_str(value: &str) -> Result<Self, Self::Err> {
Ok(Self(match value.trim_end_matches('/') {
"none" => None,
_ => Some(PartialChannelToolchainName::from_str(value)?),
}))
}
}

#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "kebab-case")]
pub enum SelfUpdateMode {
Expand Down
5 changes: 2 additions & 3 deletions src/cli/setup_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
use crate::{
cli::{
common::{self, update_console_filter},
self_update::{self, InstallOpts},
self_update::{self, DefaultChannelToolchain, InstallOpts},
},
dist::Profile,
process::Process,
toolchain::MaybeChannelToolchainName,
utils,
};

Expand Down Expand Up @@ -44,7 +43,7 @@ struct RustupInit {

/// Choose a default toolchain to install. Use 'none' to not install any toolchains at all
#[arg(long)]
default_toolchain: Option<MaybeChannelToolchainName>,
default_toolchain: Option<DefaultChannelToolchain>,

#[arg(long, value_enum, default_value_t)]
profile: Profile,
Expand Down
5 changes: 2 additions & 3 deletions src/toolchain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ pub(crate) use channels::ChannelToolchain;

mod names;
pub(crate) use names::{
CustomToolchainName, MaybeChannelToolchainName, MaybePartialToolchainName, Override,
PartialToolchainName, PartialToolchainNameOrPath, ToolchainName, ToolchainNameExt,
ToolchainNameOrPath, ToolchainPath,
CustomToolchainName, Override, PartialToolchainName, PartialToolchainNameOrPath, ToolchainName,
ToolchainNameExt, ToolchainNameOrPath, ToolchainPath,
};

/// A toolchain installed on the local disk
Expand Down
68 changes: 0 additions & 68 deletions src/toolchain/names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,74 +207,6 @@ impl Display for PartialToolchainName {
}
}

/// A toolchain name from user input. MaybeToolchainName accepts 'none' or a
/// custom or resolvable official name. Possibly this should be an Option with a
/// local trait for our needs.
#[derive(Debug, Clone)]
pub(crate) enum MaybePartialToolchainName {
Some(PartialToolchainName),
None,
}

impl FromStr for MaybePartialToolchainName {
type Err = InvalidName;

// If value could be resolved, return a ready to resolve version of it.
// Otherwise error.
fn from_str(value: &str) -> Result<Self, Self::Err> {
Ok(match normalize_name(value)? {
"none" => Self::None,
candidate => Self::Some(PartialToolchainName::from_str(candidate)?),
})
}
}

impl Display for MaybePartialToolchainName {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Some(t) => write!(f, "{t}"),
Self::None => write!(f, "none"),
}
}
}

impl From<PartialToolchainName> for MaybePartialToolchainName {
fn from(value: PartialToolchainName) -> Self {
Self::Some(value)
}
}

/// PartialToolchainName + none, for overriding default-has-a-value
/// situations in the CLI with an official toolchain name or none
#[derive(Debug, Clone)]
pub(crate) enum MaybeChannelToolchainName {
None,
Some(PartialChannelToolchainName),
}

impl FromStr for MaybeChannelToolchainName {
type Err = InvalidName;

fn from_str(value: &str) -> Result<Self, Self::Err> {
Ok(match validate_name(value)? {
"none" => Self::None,
candidate => Self::Some(
PartialChannelToolchainName::from_str(candidate)
.map_err(|_| InvalidName::OfficialName(candidate.into()))?,
),
})
}
}

impl Display for MaybeChannelToolchainName {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::None => write!(f, "none"),
Self::Some(t) => write!(f, "{t}"),
}
}
}

/// ToolchainName can be used in calls to Cfg that alter configuration,
/// like setting overrides, or that depend on configuration, like calculating
/// the toolchain directory.
Expand Down
Loading