Imply sysroot-abi feature when in-rust-tree is set

Author: Veykril

src/bootstrap/src/core/build_steps/test.rs

@@ -385,7 +385,7 @@ impl Step for RustAnalyzer {
             "test",
             crate_path,
             SourceType::InTree,
-            &["sysroot-abi".to_owned(), "in-rust-tree".to_owned()],
+            &["in-rust-tree".to_owned()],
         );
         cargo.allow_features(tool::RustAnalyzer::ALLOW_FEATURES);
 

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

@@ -675,7 +675,7 @@ impl Step for RustAnalyzerProcMacroSrv {
             tool: "rust-analyzer-proc-macro-srv",
             mode: Mode::ToolRustc,
             path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli",
-            extra_features: vec!["sysroot-abi".to_owned(), "in-rust-tree".to_owned()],
+            extra_features: vec!["in-rust-tree".to_owned()],
             source_type: SourceType::InTree,
             allow_features: RustAnalyzer::ALLOW_FEATURES,
         });

src/tools/rust-analyzer/crates/proc-macro-srv/Cargo.toml

@@ -36,4 +36,4 @@ proc-macro-test.workspace = true
 
 [features]
 sysroot-abi = []
-in-rust-tree = ["mbe/in-rust-tree"]
+in-rust-tree = ["mbe/in-rust-tree", "sysroot-abi"]