Hackily disable even more things

Author: WaffleLapkin

src/bootstrap/src/core/build_steps/doc.rs

@@ -904,6 +904,10 @@ macro_rules! tool_doc {
             /// we do not merge it with the other documentation from std, test and
             /// proc_macros. This is largely just a wrapper around `cargo doc`.
             fn run(self, builder: &Builder<'_>) {
+                if stringify!($tool).to_lowercase() == "cargo" {
+                    return;
+                }
+
                 let stage = builder.top_stage;
                 let target = self.target;
 

src/bootstrap/src/core/build_steps/tool.rs

@@ -597,11 +597,11 @@ impl Step for RustAnalyzer {
         )
     }
 
-    fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(RustAnalyzer {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
-            target: run.target,
-        });
+    fn make_run(_run: RunConfig<'_>) {
+        // run.builder.ensure(RustAnalyzer {
+        //     compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
+        //     target: run.target,
+        // });
     }
 
     fn run(self, builder: &Builder<'_>) -> PathBuf {
@@ -644,11 +644,11 @@ impl Step for RustAnalyzerProcMacroSrv {
             )
     }
 
-    fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(RustAnalyzerProcMacroSrv {
-            compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
-            target: run.target,
-        });
+    fn make_run(_run: RunConfig<'_>) {
+        // run.builder.ensure(RustAnalyzerProcMacroSrv {
+        //     compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
+        //     target: run.target,
+        // });
     }
 
     fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
@@ -784,6 +784,10 @@ macro_rules! tool_extended {
             }
 
             fn make_run(run: RunConfig<'_>) {
+                if stringify!($name).to_lowercase().ends_with("clippy") {
+                    return;
+                }
+
                 run.builder.ensure($name {
                     compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
                     target: run.target,

src/tools/opt-dist/src/training.rs

@@ -8,7 +8,7 @@ use humansize::BINARY;
 
 const LLVM_PGO_CRATES: &[&str] = &[
     "syn-1.0.89",
-    "cargo-0.60.0",
+    //"cargo-0.60.0",
     "serde-1.0.136",
     "ripgrep-13.0.0",
     "regex-1.5.5",
@@ -19,7 +19,7 @@ const LLVM_PGO_CRATES: &[&str] = &[
 const RUSTC_PGO_CRATES: &[&str] = &[
     "externs",
     "ctfe-stress-5",
-    "cargo-0.60.0",
+    //"cargo-0.60.0",
     "token-stream-stress",
     "match-stress",
     "tuple-stress",