Merge pull request #2740 from hi-rustin/rustin-patch-fix-arg0-msg

Add the missing tools for valid_proxy_names

Author: kinnison

src/bin/rustup-init.rs

@@ -28,7 +28,7 @@ use rustup::cli::setup_mode;
 use rustup::currentprocess::{process, with, OSProcess};
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
 use rustup::utils::utils;
-use rustup::{TOOLS, DUP_TOOLS};
+use rustup::{DUP_TOOLS, TOOLS};
 
 fn main() {
     let process = OSProcess::default();
@@ -94,7 +94,12 @@ fn run_rustup_inner() -> Result<utils::ExitCode> {
             }
         }
         Some(n) => {
-            if TOOLS.iter().chain(DUP_TOOLS.iter()).find(|&&name| name == n).is_some() {
+            if TOOLS
+                .iter()
+                .chain(DUP_TOOLS.iter())
+                .find(|&&name| name == n)
+                .is_some()
+            {
                 proxy_mode::main()
             } else {
                 Err(ErrorKind::UnknownProxyName(n.to_string()).into())

src/cli/errors.rs

@@ -13,7 +13,7 @@ use strsim::damerau_levenshtein;
 
 use super::rustup_mode::CompletionCommand;
 use crate::dist::temp;
-use crate::TOOLS;
+use crate::{DUP_TOOLS, TOOLS};
 
 error_chain! {
     links {
@@ -86,6 +86,7 @@ error_chain! {
 fn valid_proxy_names() -> String {
     TOOLS
         .iter()
+        .chain(DUP_TOOLS.iter())
         .map(|s| format!("'{}'", s))
         .collect::<Vec<_>>()
         .join(", ")

tests/cli-misc.rs

@@ -325,7 +325,7 @@ fn rustup_failed_path_search() {
         expect_err(
             config,
             broken,
-            &format!("unknown proxy name: 'fake_proxy'; valid proxy names are 'rustc', 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rls', 'cargo-clippy', 'clippy-driver', 'cargo-miri'",),
+            &"unknown proxy name: 'fake_proxy'; valid proxy names are 'rustc', 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rls', 'cargo-clippy', 'clippy-driver', 'cargo-miri', 'rustfmt', 'cargo-fmt'".to_string(),
         );
 
         // Hardlink will be automatically cleaned up by test setup code