Fix up feature gates

Author: Veykril

src/tools/rust-analyzer/crates/proc-macro-api/src/legacy_protocol/msg/flat.rs

@@ -34,10 +34,12 @@
 //! as we don't have bincode in Cargo.toml yet, lets stick with serde_json for
 //! the time being.
 
+#[cfg(feature = "sysroot-abi")]
+use proc_macro_srv::TokenStream;
+
 use std::collections::VecDeque;
 
 use intern::Symbol;
-use proc_macro_srv::TokenStream;
 use rustc_hash::FxHashMap;
 use serde_derive::{Deserialize, Serialize};
 use span::{EditionedFileId, ErasedFileAstId, Span, SpanAnchor, SyntaxContext, TextRange};
@@ -162,6 +164,39 @@ impl FlatTree {
         }
     }
 
+    pub fn to_subtree_resolved(
+        self,
+        version: u32,
+        span_data_table: &SpanDataIndexMap,
+    ) -> tt::TopSubtree<Span> {
+        Reader::<Span> {
+            subtree: if version >= ENCODE_CLOSE_SPAN_VERSION {
+                read_vec(self.subtree, SubtreeRepr::read_with_close_span)
+            } else {
+                read_vec(self.subtree, SubtreeRepr::read)
+            },
+            literal: if version >= EXTENDED_LEAF_DATA {
+                read_vec(self.literal, LiteralRepr::read_with_kind)
+            } else {
+                read_vec(self.literal, LiteralRepr::read)
+            },
+            punct: read_vec(self.punct, PunctRepr::read),
+            ident: if version >= EXTENDED_LEAF_DATA {
+                read_vec(self.ident, IdentRepr::read_with_rawness)
+            } else {
+                read_vec(self.ident, IdentRepr::read)
+            },
+            token_tree: self.token_tree,
+            text: self.text,
+            span_data_table,
+            version,
+        }
+        .read_subtree()
+    }
+}
+
+#[cfg(feature = "sysroot-abi")]
+impl FlatTree {
     pub fn from_tokenstream(
         tokenstream: proc_macro_srv::TokenStream<Span>,
         version: u32,
@@ -265,37 +300,6 @@ impl FlatTree {
         }
     }
 
-    pub fn to_subtree_resolved(
-        self,
-        version: u32,
-        span_data_table: &SpanDataIndexMap,
-    ) -> tt::TopSubtree<Span> {
-        Reader::<Span> {
-            subtree: if version >= ENCODE_CLOSE_SPAN_VERSION {
-                read_vec(self.subtree, SubtreeRepr::read_with_close_span)
-            } else {
-                read_vec(self.subtree, SubtreeRepr::read)
-            },
-            literal: if version >= EXTENDED_LEAF_DATA {
-                read_vec(self.literal, LiteralRepr::read_with_kind)
-            } else {
-                read_vec(self.literal, LiteralRepr::read)
-            },
-            punct: read_vec(self.punct, PunctRepr::read),
-            ident: if version >= EXTENDED_LEAF_DATA {
-                read_vec(self.ident, IdentRepr::read_with_rawness)
-            } else {
-                read_vec(self.ident, IdentRepr::read)
-            },
-            token_tree: self.token_tree,
-            text: self.text,
-            span_data_table,
-            version,
-        }
-        .read_subtree()
-    }
-}
-impl FlatTree {
     pub fn to_tokenstream_unresolved<T: SpanTransformer<Table = ()>>(
         self,
         version: u32,
@@ -836,6 +840,7 @@ impl<T: SpanTransformer> Reader<'_, T> {
     }
 }
 
+#[cfg(feature = "sysroot-abi")]
 impl<T: SpanTransformer> Reader<'_, T> {
     pub(crate) fn read_tokenstream(self) -> proc_macro_srv::TokenStream<T::Span> {
         let mut res: Vec<Option<proc_macro_srv::Group<T::Span>>> = vec![None; self.subtree.len()];

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

@@ -18,7 +18,7 @@ clap = {version = "4.5.42", default-features = false, features = ["std"]}
 postcard = { version = "1.1.3", optional = true }
 
 [features]
-default = ["postcard", "sysroot-abi"]
+default = ["postcard"]
 sysroot-abi = ["proc-macro-srv/sysroot-abi", "proc-macro-api/sysroot-abi"]
 in-rust-tree = ["proc-macro-srv/in-rust-tree", "sysroot-abi"]
 postcard = ["dep:postcard"]

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

@@ -5,7 +5,6 @@ use std::{env, path::PathBuf, process::Command};
 fn main() {
     set_rerun();
     set_commit_info();
-    println!("cargo::rustc-check-cfg=cfg(rust_analyzer)");
 }
 
 fn set_rerun() {

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

@@ -9,10 +9,10 @@ extern crate rustc_driver as _;
 
 mod version;
 
-#[cfg(any(feature = "sysroot-abi", rust_analyzer))]
+#[cfg(feature = "sysroot-abi")]
 mod main_loop;
 use clap::{Command, ValueEnum};
-#[cfg(any(feature = "sysroot-abi", rust_analyzer))]
+#[cfg(feature = "sysroot-abi")]
 use main_loop::run;
 
 fn main() -> std::io::Result<()> {
@@ -77,7 +77,7 @@ impl ValueEnum for ProtocolFormat {
     }
 }
 
-#[cfg(not(any(feature = "sysroot-abi", rust_analyzer)))]
+#[cfg(not(feature = "sysroot-abi"))]
 fn run(_: ProtocolFormat) -> std::io::Result<()> {
     Err(std::io::Error::new(
         std::io::ErrorKind::Unsupported,

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

@@ -36,7 +36,7 @@ expect-test.workspace = true
 proc-macro-test.path = "./proc-macro-test"
 
 [features]
-default = ["sysroot-abi"]
+default = []
 sysroot-abi = []
 in-rust-tree = ["sysroot-abi"]
 

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

@@ -4,8 +4,6 @@
 use std::{env, process::Command};
 
 fn main() {
-    println!("cargo::rustc-check-cfg=cfg(rust_analyzer)");
-
     let rustc = env::var("RUSTC").expect("proc-macro-srv's build script expects RUSTC to be set");
     #[allow(clippy::disallowed_methods)]
     let output = Command::new(rustc).arg("--version").output().expect("rustc --version must run");

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

@@ -1,3 +1,5 @@
+//! `proc_macro::bridge` newtypes.
+
 use proc_macro::bridge as pm_bridge;
 
 pub use pm_bridge::{DelimSpan, Diagnostic, ExpnGlobals, LitKind};

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

@@ -10,11 +10,16 @@
 //! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable`
 //!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
 
-#![cfg(any(feature = "sysroot-abi", rust_analyzer))]
-#![cfg_attr(not(feature = "sysroot-abi"), allow(unused_crate_dependencies))]
+#![cfg(feature = "sysroot-abi")]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 #![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
-#![allow(unreachable_pub, internal_features, clippy::disallowed_types, clippy::print_stderr)]
+#![allow(
+    unreachable_pub,
+    internal_features,
+    clippy::disallowed_types,
+    clippy::print_stderr,
+    unused_crate_dependencies
+)]
 #![deny(deprecated_safe, clippy::undocumented_unsafe_blocks)]
 
 extern crate proc_macro;