Various minor/cosmetic improvements to code

[rust.git] / src / bootstrap / tool.rs

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 4acc739db57bf1d020685bfcebbd3a45c0d0d75f..1bd4403a66ffa9aea6888d9f02f7fefd6086f77a 100644 (file)
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -264,7 +264,6 @@ macro_rules! tool {
         $name:ident, $path:expr, $tool_name:expr, $mode:expr
         $(,llvm_tools = $llvm:expr)*
         $(,is_external_tool = $external:expr)*
-        $(,cargo_test_root = $cargo_test_root:expr)*
         ;
     )+) => {
         #[derive(Copy, PartialEq, Eq, Clone)]
@@ -288,15 +287,6 @@ pub fn uses_llvm_tools(&self) -> bool {
                     $(Tool::$name => false $(|| $llvm)*,)+
                 }
             }
-
-            /// Whether this tool requires may run Cargo for test crates,
-            /// which currently needs setting the environment variable
-            /// `__CARGO_TEST_ROOT` to separate it from the workspace.
-            pub fn needs_cargo_test_root(&self) -> bool {
-                match self {
-                    $(Tool::$name => false $(|| $cargo_test_root)*,)+
-                }
-            }
         }
 
         impl<'a> Builder<'a> {
@@ -372,9 +362,8 @@ fn run(self, builder: &Builder) -> PathBuf {
     UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap;
     Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap;
     Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap;
-    CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap, cargo_test_root = true;
-    Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap,
-        llvm_tools = true, cargo_test_root = true;
+    CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap;
+    Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true;
     BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap;
     RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap;
     RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap,
@@ -657,7 +646,7 @@ fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
             self.cargo_out(compiler, tool.get_mode(), *host).join("deps"),
         ];
 
-        // On MSVC a tool may invoke a C compiler (e.g. compiletest in run-make
+        // On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
         // mode) and that C compiler may need some extra PATH modification. Do
         // so here.
         if compiler.host.contains("msvc") {
@@ -693,11 +682,6 @@ fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
             }
         }
 
-        // Set `__CARGO_TEST_ROOT` to the build directory if needed.
-        if tool.needs_cargo_test_root() {
-            cmd.env("__CARGO_TEST_ROOT", &self.config.out);
-        }
-
         add_lib_path(lib_paths, cmd);
     }