Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+1,575 −1,189
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26f7400
proc-macro-srv: Reimplement token trees via ropes
Veykril Nov 19, 2025
c26d5f5
Simplify
Veykril Nov 22, 2025
5409a40
Implement rpc protocol changes
Veykril Nov 22, 2025
b5fc29e
Fix up feature gates
Veykril Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/hir-def/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ tracing.workspace = true
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
Expand Down
2 changes: 0 additions & 2 deletions crates/hir-ty/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rustc-hash.workspace = true
scoped-tls = "1.0.1"
la-arena.workspace = true
triomphe.workspace = true
typed-arena = "2.0.2"
Expand Down
1 change: 0 additions & 1 deletion crates/hir/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ itertools.workspace = true
smallvec.workspace = true
tracing.workspace = true
triomphe.workspace = true
indexmap.workspace = true

ra-ap-rustc_type_ir.workspace = true

Expand Down
1 change: 0 additions & 1 deletion crates/ide-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions crates/proc-macro-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions crates/proc-macro-api/src/legacy_protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion crates/proc-macro-api/src/legacy_protocol/msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading