Merge pull request #2952 from hi-rustin/rustin-patch-tests

Add tests for proxyable tools

Author: kinnison

src/bin/rustup-init.rs

@@ -25,8 +25,8 @@ use rustup::cli::self_update;
 use rustup::cli::setup_mode;
 use rustup::currentprocess::{process, with, OSProcess};
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
+use rustup::is_proxyable_tools;
 use rustup::utils::utils;
-use rustup::{DUP_TOOLS, TOOLS};
 
 fn main() {
     let process = OSProcess::default();
@@ -81,20 +81,8 @@ fn run_rustup_inner() -> Result<utils::ExitCode> {
             }
         }
         Some(n) => {
-            if TOOLS.iter().chain(DUP_TOOLS.iter()).any(|&name| name == n) {
-                proxy_mode::main(n)
-            } else {
-                Err(anyhow!(format!(
-                    "unknown proxy name: '{}'; valid proxy names are {}",
-                    n,
-                    TOOLS
-                        .iter()
-                        .chain(DUP_TOOLS.iter())
-                        .map(|s| format!("'{}'", s))
-                        .collect::<Vec<_>>()
-                        .join(", ")
-                )))
-            }
+            is_proxyable_tools(n)?;
+            proxy_mode::main(n)
         }
         None => {
             // Weird case. No arg0, or it's unparsable.

src/lib.rs

@@ -13,6 +13,7 @@ pub use crate::errors::*;
 pub use crate::notifications::*;
 use crate::toolchain::*;
 pub(crate) use crate::utils::toml_utils;
+use anyhow::{anyhow, Result};
 
 #[macro_use]
 extern crate rs_tracing;
@@ -36,6 +37,28 @@ pub static TOOLS: &[&str] = &[
 // installation.
 pub static DUP_TOOLS: &[&str] = &["rustfmt", "cargo-fmt"];
 
+// If the given name is one of the tools we proxy.
+pub fn is_proxyable_tools(tool: &str) -> Result<()> {
+    if TOOLS
+        .iter()
+        .chain(DUP_TOOLS.iter())
+        .any(|&name| name == tool)
+    {
+        Ok(())
+    } else {
+        Err(anyhow!(format!(
+            "unknown proxy name: '{}'; valid proxy names are {}",
+            tool,
+            TOOLS
+                .iter()
+                .chain(DUP_TOOLS.iter())
+                .map(|s| format!("'{}'", s))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )))
+    }
+}
+
 fn component_for_bin(binary: &str) -> Option<&'static str> {
     use std::env::consts::EXE_SUFFIX;
 
@@ -74,3 +97,25 @@ mod settings;
 pub mod test;
 mod toolchain;
 pub mod utils;
+
+#[cfg(test)]
+mod tests {
+    use crate::{is_proxyable_tools, DUP_TOOLS, TOOLS};
+
+    #[test]
+    fn test_is_proxyable_tools() {
+        for tool in TOOLS {
+            assert!(is_proxyable_tools(tool).is_ok());
+        }
+        for tool in DUP_TOOLS {
+            assert!(is_proxyable_tools(tool).is_ok());
+        }
+        let message = &"unknown proxy name: 'unknown-tool'; valid proxy names are 'rustc', \
+        'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rust-gdbgui', 'rls', 'cargo-clippy', \
+        'clippy-driver', 'cargo-miri', 'rustfmt', 'cargo-fmt'";
+        assert!(is_proxyable_tools("unknown-tool")
+            .unwrap_err()
+            .to_string()
+            .eq(message));
+    }
+}