Auto merge of #118861 - Veykril:r-a-in-tree, r=onur-ozkan

Set the `in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps

Some context: This came up in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/libraryfying.20match.20checking.3F where `test` and `check` behaved differently for rust-analyzer
r? `@onur-ozkan`

src/bootstrap/src/core/build_steps/check.rs

@@ -386,7 +386,7 @@ impl Step for RustAnalyzer {
             cargo_subcommand(builder.kind),
             "src/tools/rust-analyzer",
             SourceType::InTree,
-            &["rust-analyzer/in-rust-tree".to_owned()],
+            &["in-rust-tree".to_owned()],
         );
 
         cargo.allow_features(crate::core::build_steps::tool::RustAnalyzer::ALLOW_FEATURES);

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()],
         );
         cargo.allow_features(tool::RustAnalyzer::ALLOW_FEATURES);
 

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

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

src/tools/rust-analyzer/crates/mbe/Cargo.toml

@@ -27,5 +27,8 @@ span.workspace = true
 [dev-dependencies]
 test-utils.workspace = true
 
+[features]
+in-rust-tree = ["parser/in-rust-tree", "syntax/in-rust-tree"]
+
 [lints]
-workspace = true
+workspace = true

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

@@ -14,10 +14,12 @@ proc-macro-api.workspace = true
 
 [features]
 sysroot-abi = ["proc-macro-srv/sysroot-abi"]
+in-rust-tree = ["proc-macro-srv/in-rust-tree", "sysroot-abi"]
+
 
 [[bin]]
 name = "rust-analyzer-proc-macro-srv"
 path = "src/main.rs"
 
 [lints]
-workspace = true
+workspace = true

src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main.rs

@@ -1,5 +1,9 @@
 //! A standalone binary for `proc-macro-srv`.
 //! Driver for proc macro server
+#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_driver as _;
+
 use std::io;
 
 fn main() -> std::io::Result<()> {

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

@@ -38,6 +38,7 @@ proc-macro-test.path = "./proc-macro-test"
 
 [features]
 sysroot-abi = ["proc-macro-test/sysroot-abi"]
+in-rust-tree = ["mbe/in-rust-tree", "sysroot-abi"]
 
 [lints]
-workspace = true
+workspace = true

src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs

@@ -11,11 +11,12 @@
 //!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
 
 #![cfg(any(feature = "sysroot-abi", rust_analyzer))]
-#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
+#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span, rustc_private)]
 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![allow(unreachable_pub, internal_features)]
 
 extern crate proc_macro;
+extern crate rustc_driver as _;
 
 mod dylib;
 mod server;

src/tools/rust-analyzer/crates/rust-analyzer/src/bin/main.rs

@@ -5,8 +5,7 @@
 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 #[cfg(feature = "in-rust-tree")]
-#[allow(unused_extern_crates)]
+extern crate rustc_driver as _;
-extern crate rustc_driver;
 
 mod logger;
 mod rustc_wrapper;