language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Run proc macro expansion in a separate thread (for the thread-local interner)

Browse source
This commit is contained in:
Amos Wenger 2022-07-21 18:11:50 +02:00
parent 05d8f5fee7
commit 32ee097580
3 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/proc-macro-srv/Cargo.toml
View file

@ -24,6 +24,7 @@ tt = { path = "../tt", version = "0.0.0" }
mbe = { path = "../mbe", version = "0.0.0" }
paths = { path = "../paths", version = "0.0.0" }
proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" }
crossbeam = "0.8.1"
[dev-dependencies]
expect-test = "1.4.0"

13
crates/proc-macro-srv/src/lib.rs
View file

@ -63,9 +63,16 @@ impl ProcMacroSrv {
let macro_body = task.macro_body.to_subtree();
let attributes = task.attributes.map(|it| it.to_subtree());
let result = expander
.expand(&task.macro_name, &macro_body, attributes.as_ref())
.map(|it| FlatTree::new(&it));
let result = crossbeam::scope(|s| {
s.spawn(|_| {
expander
.expand(&task.macro_name, &macro_body, attributes.as_ref())
.map(|it| FlatTree::new(&it))
})
.join()
.unwrap()
})
.unwrap();
prev_env.rollback();