Allow required unstable features for RA sysroot ABI

Author: fasterthanlime

src/bootstrap/builder.rs

@@ -1558,7 +1558,7 @@ impl<'a> Builder<'a> {
             Mode::ToolStd => {
                 // Right now this is just compiletest and a few other tools that build on stable.
                 // Allow them to use `feature(test)`, but nothing else.
-                rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace");
+                rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
             }
             Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
         }

src/bootstrap/dist.rs

@@ -1058,7 +1058,11 @@ impl Step for RustAnalyzer {
         }
 
         let rust_analyzer = builder
-            .ensure(tool::RustAnalyzer { compiler, target, extra_features: Vec::new() })
+            .ensure(tool::RustAnalyzer {
+                compiler,
+                target,
+                extra_features: vec!["in-rust-tree".to_owned()]
+            })
             .expect("rust-analyzer always builds");
 
         let mut tarball = Tarball::new(builder, "rust-analyzer", &target.triple);

src/bootstrap/test.rs

@@ -378,7 +378,11 @@ impl Step for RustAnalyzer {
         let compiler = builder.compiler(stage, host);
 
         builder
-            .ensure(tool::RustAnalyzer { compiler, target: self.host, extra_features: Vec::new() })
+            .ensure(tool::RustAnalyzer {
+                compiler,
+                target: self.host,
+                extra_features: vec!["in-rust-tree".to_owned()]
+            })
             .expect("in-tree tool");
 
         let mut cargo = tool::prepare_tool_cargo(

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

@@ -22,8 +22,11 @@
 //! need to update the conditionals in `Abi::from_lib` to return your new ABI
 //! for the relevant versions of the rust compiler
 
+#[cfg(not(feature = "in-rust-tree"))]
 mod abi_1_58;
+#[cfg(not(feature = "in-rust-tree"))]
 mod abi_1_63;
+#[cfg(not(feature = "in-rust-tree"))]
 mod abi_1_64;
 #[cfg(feature = "in-rust-tree")]
 mod abi_sysroot;
@@ -33,8 +36,11 @@ mod abi_sysroot;
 pub(crate) use abi_1_64::TokenStream as TestTokenStream;
 
 use super::dylib::LoadProcMacroDylibError;
+#[cfg(not(feature = "in-rust-tree"))]
 pub(crate) use abi_1_58::Abi as Abi_1_58;
+#[cfg(not(feature = "in-rust-tree"))]
 pub(crate) use abi_1_63::Abi as Abi_1_63;
+#[cfg(not(feature = "in-rust-tree"))]
 pub(crate) use abi_1_64::Abi as Abi_1_64;
 #[cfg(feature = "in-rust-tree")]
 pub(crate) use abi_sysroot::Abi as AbiSysroot;
@@ -52,8 +58,11 @@ impl PanicMessage {
 }
 
 pub(crate) enum Abi {
+    #[cfg(not(feature = "in-rust-tree"))]
     Abi1_58(Abi_1_58),
+    #[cfg(not(feature = "in-rust-tree"))]
     Abi1_63(Abi_1_63),
+    #[cfg(not(feature = "in-rust-tree"))]
     Abi1_64(Abi_1_64),
     #[cfg(feature = "in-rust-tree")]
     Sysroot(AbiSysroot),
@@ -82,6 +91,7 @@ impl Abi {
 
         // FIXME: this should use exclusive ranges when they're stable
         // https://github.com/rust-lang/rust/issues/37854
+        #[cfg(not(feature = "in-rust-tree"))]
         match (info.version.0, info.version.1) {
             (1, 58..=62) => {
                 let inner = unsafe { Abi_1_58::from_lib(lib, symbol_name) }?;
@@ -106,8 +116,11 @@ impl Abi {
         attributes: Option<&tt::Subtree>,
     ) -> Result<tt::Subtree, PanicMessage> {
         match self {
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_58(abi) => abi.expand(macro_name, macro_body, attributes),
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_63(abi) => abi.expand(macro_name, macro_body, attributes),
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_64(abi) => abi.expand(macro_name, macro_body, attributes),
             #[cfg(feature = "in-rust-tree")]
             Self::AbiSysroot(abi) => abi.expand(macro_name, macro_body, attributes),
@@ -116,8 +129,11 @@ impl Abi {
 
     pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
         match self {
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_58(abi) => abi.list_macros(),
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_63(abi) => abi.list_macros(),
+            #[cfg(not(feature = "in-rust-tree"))]
             Self::Abi1_64(abi) => abi.list_macros(),
             #[cfg(feature = "in-rust-tree")]
             Self::AbiSysroot(abi) => abi.list_macros(),