Merge pull request #21097 from Veykril/push-zpqupukpkrts

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

Author: Veykril

src/tools/rust-analyzer/Cargo.lock

@@ -772,7 +772,6 @@ dependencies = [
  "hir-def",
  "hir-expand",
  "hir-ty",
- "indexmap",
  "intern",
  "itertools 0.14.0",
  "ra-ap-rustc_type_ir",
@@ -824,7 +823,6 @@ dependencies = [
  "syntax-bridge",
  "test-fixture",
  "test-utils",
- "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "thin-vec",
  "tracing",
  "triomphe",
@@ -864,7 +862,6 @@ version = "0.0.0"
 dependencies = [
  "arrayvec",
  "base-db",
- "bitflags 2.9.4",
  "cov-mark",
  "either",
  "ena",
@@ -890,7 +887,6 @@ dependencies = [
  "rustc_apfloat",
  "salsa",
  "salsa-macros",
- "scoped-tls",
  "smallvec",
  "span",
  "stdx",
@@ -1085,7 +1081,6 @@ dependencies = [
  "expect-test",
  "fst",
  "hir",
- "indexmap",
  "itertools 0.14.0",
  "line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "macros",
@@ -1825,6 +1820,7 @@ dependencies = [
  "indexmap",
  "intern",
  "paths",
+ "proc-macro-srv",
  "rustc-hash 2.1.1",
  "serde",
  "serde_derive",
@@ -1849,9 +1845,7 @@ dependencies = [
  "proc-macro-test",
  "ra-ap-rustc_lexer",
  "span",
- "syntax-bridge",
  "temp-dir",
- "tt",
 ]
 
 [[package]]
@@ -2291,14 +2285,12 @@ dependencies = [
  "ide-db",
  "ide-ssr",
  "indexmap",
- "intern",
  "itertools 0.14.0",
  "load-cargo",
  "lsp-server 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "lsp-types",
  "memchr",
  "mimalloc",
- "nohash-hasher",
  "num_cpus",
  "oorandom",
  "parking_lot",
@@ -2491,12 +2483,6 @@ dependencies = [
  "protobuf",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"

src/tools/rust-analyzer/crates/hir-def/Cargo.toml

@@ -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

src/tools/rust-analyzer/crates/hir-ty/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"

src/tools/rust-analyzer/crates/hir/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
 

src/tools/rust-analyzer/crates/ide-db/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

src/tools/rust-analyzer/crates/proc-macro-api/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

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

@@ -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,

src/tools/rust-analyzer/crates/proc-macro-api/src/legacy_protocol/msg.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 {