Remove the "multirust" bin

rust-lang · Apr 15, 2016 · c4417ff · c4417ff
1 parent 999e1c5
commit c4417ff
Show file tree

Hide file tree

Showing 6 changed files with 259 additions and 898 deletions.
diff --git a/src/rustup-mock/src/clitools.rs b/src/rustup-mock/src/clitools.rs
@@ -84,21 +84,19 @@ pub fn setup(s: Scenario, f: &Fn(&Config)) {
 
     let current_exe_path = env::current_exe().map(PathBuf::from).unwrap();
     let exe_dir = current_exe_path.parent().unwrap();
-    let ref multirust_build_path = exe_dir.join(format!("rustup-setup{}", EXE_SUFFIX));
+    let ref build_path = exe_dir.join(format!("rustup-setup{}", EXE_SUFFIX));
 
-    let ref multirust_path = config.exedir.join(format!("multirust{}", EXE_SUFFIX));
-    let setup_path = config.exedir.join(format!("multirust-setup{}", EXE_SUFFIX));
+    let ref rustup_path = config.exedir.join(format!("rustup{}", EXE_SUFFIX));
+    let setup_path = config.exedir.join(format!("rustup-setup{}", EXE_SUFFIX));
+    let multirust_setup_path = config.exedir.join(format!("multirust-setup{}", EXE_SUFFIX));
     let rustc_path = config.exedir.join(format!("rustc{}", EXE_SUFFIX));
     let cargo_path = config.exedir.join(format!("cargo{}", EXE_SUFFIX));
-    let rustup_setup_path = config.exedir.join(format!("rustup-setup{}", EXE_SUFFIX));
-    let rustup_path = config.exedir.join(format!("rustup{}", EXE_SUFFIX));
-
-    fs::copy(multirust_build_path, multirust_path).unwrap();
-    fs::hard_link(multirust_path, rustc_path).unwrap();
-    fs::hard_link(multirust_path, setup_path).unwrap();
-    fs::hard_link(multirust_path, cargo_path).unwrap();
-    fs::hard_link(multirust_path, rustup_setup_path).unwrap();
-    fs::hard_link(multirust_path, rustup_path).unwrap();
+
+    fs::copy(build_path, rustup_path).unwrap();
+    fs::hard_link(rustup_path, setup_path).unwrap();
+    fs::hard_link(rustup_path, multirust_setup_path).unwrap();
+    fs::hard_link(rustup_path, rustc_path).unwrap();
+    fs::hard_link(rustup_path, cargo_path).unwrap();
 
     // Create some custom toolchains
     create_custom_toolchains(&config.customdir);