Merge pull request #21097 from Veykril/push-zpqupukpkrts

proc-macro-srv: Reimplement token trees via immutable trees

Author: Veykril

Cargo.lock

@@ -27,7 +27,6 @@ tracing = { workspace = true, features = ["attributes"] }
 smallvec.workspace = true
 triomphe.workspace = true
 rustc_apfloat = "0.2.3"
-text-size.workspace = true
 salsa.workspace = true
 salsa-macros.workspace = true
 query-group.workspace = true

crates/hir-def/Cargo.toml

@@ -16,14 +16,12 @@ doctest = false
 cov-mark = "2.0.0"
 itertools.workspace = true
 arrayvec.workspace = true
-bitflags.workspace = true
 smallvec.workspace = true
 ena = "0.14.3"
 either.workspace = true
 oorandom = "11.1.5"
 tracing = { workspace = true, features = ["attributes"] }
 rustc-hash.workspace = true
-scoped-tls = "1.0.1"
 la-arena.workspace = true
 triomphe.workspace = true
 typed-arena = "2.0.2"

crates/hir-ty/Cargo.toml

@@ -20,7 +20,6 @@ itertools.workspace = true
 smallvec.workspace = true
 tracing = { workspace = true, features = ["attributes"] }
 triomphe.workspace = true
-indexmap.workspace = true
 
 ra-ap-rustc_type_ir.workspace = true
 

crates/hir/Cargo.toml

@@ -22,7 +22,6 @@ rustc-hash.workspace = true
 either.workspace = true
 itertools.workspace = true
 arrayvec.workspace = true
-indexmap.workspace = true
 memchr = "2.7.5"
 salsa.workspace = true
 salsa-macros.workspace = true

crates/ide-db/Cargo.toml

@@ -24,10 +24,14 @@ indexmap.workspace = true
 paths = { workspace = true, features = ["serde1"] }
 tt.workspace = true
 stdx.workspace = true
+proc-macro-srv = {workspace = true, optional = true}
 # span = {workspace = true, default-features = false} does not work
 span = { path = "../span", version = "0.0.0", default-features = false}
 
 intern.workspace = true
 
+[features]
+sysroot-abi = ["proc-macro-srv", "proc-macro-srv/sysroot-abi"]
+
 [lints]
 workspace = true

crates/proc-macro-api/Cargo.toml

@@ -95,9 +95,10 @@ pub(crate) fn expand(
     let mixed_site = span_data_table.insert_full(mixed_site).0;
     let task = ExpandMacro {
         data: ExpandMacroData {
-            macro_body: FlatTree::new(subtree, version, &mut span_data_table),
+            macro_body: FlatTree::from_subtree(subtree, version, &mut span_data_table),
             macro_name: proc_macro.name.to_string(),
-            attributes: attr.map(|subtree| FlatTree::new(subtree, version, &mut span_data_table)),
+            attributes: attr
+                .map(|subtree| FlatTree::from_subtree(subtree, version, &mut span_data_table)),
             has_global_spans: ExpnGlobals {
                 serialize: version >= version::HAS_GLOBAL_SPANS,
                 def_site,

crates/proc-macro-api/src/legacy_protocol.rs

@@ -297,7 +297,7 @@ mod tests {
             let mut span_data_table = Default::default();
             let task = ExpandMacro {
                 data: ExpandMacroData {
-                    macro_body: FlatTree::new(tt.view(), v, &mut span_data_table),
+                    macro_body: FlatTree::from_subtree(tt.view(), v, &mut span_data_table),
                     macro_name: Default::default(),
                     attributes: None,
                     has_global_spans: ExpnGlobals {