rustup: Prevent setting an invalid default host

Perform similar checks to when resolving toolchains in order to reduce the possibility that the configuration will end up with an unusable default-host value. This finally addresses the initial point in #745 and thus fixes it. Signed-off-by: Daniel Silverstone <[email protected]>
rust-lang · Jan 14, 2019 · 49a9cec · 49a9cec
1 parent 0bb2cde
commit 49a9cec
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/rustup/config.rs b/src/rustup/config.rs
@@ -478,7 478,20 @@ impl Cfg {
  }
 
  pub fn set_default_host_triple(&self, host_triple: &str) -> Result<()> {
- if dist::PartialTargetTriple::from_str(host_triple).is_none() {
  if let Some(host) = dist::PartialTargetTriple::from_str(host_triple) {
  host.arch.ok_or_else(|| {
  format!(
  "Provided host '{}' did not specify a CPU architecture",
  host_triple
  )
  })?;
  host.os.ok_or_else(|| {
  format!(
  "Provided host '{}' did not specify an operating system",
  host_triple
  )
  })?;
  } else {
  return Err("Invalid host triple".into());
  }
  self.settings_file.with_mut(|s| {

diff --git a/tests/cli-rustup.rs b/tests/cli-rustup.rs
@@ -905,6 905,18 @@ fn set_default_host_invalid_triple() {
  });
 }
 
 // #745
 #[test]
 fn set_default_host_invalid_triple_valid_partial() {
  setup(&|config| {
  expect_err(
  config,
  &["rustup", "set", "default-host", "x86_64-msvc"],
  "error: Provided host 'x86_64-msvc' did not specify an operating system",
  );
  });
 }
 
 // #422
 #[test]
 fn update_doesnt_update_non_tracking_channels() {