Skip to content

remove TokenStream from the bridge #151830

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

Draft
cyrgani wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

remove TokenStream from the bridge #151830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
539d21d
remove `TokenStream` from the bridge
cyrgani Jan 29, 2026
2ac0b71
use rc, take 3
cyrgani Jan 30, 2026
2866d06
use references for encoding
cyrgani Jan 30, 2026
b019a81
inline smallvec use
cyrgani Jan 30, 2026
ae312ab
rc everywhere
cyrgani Jan 31, 2026
e2b0eff
clone reductions
cyrgani Feb 1, 2026
a888f39
cleanup, remove `OwnedStore`
cyrgani Feb 2, 2026
7c750ba
fix r-a
cyrgani Feb 10, 2026
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
46 changes: 27 additions & 19 deletions compiler/rustc_expand/src/proc_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,19 @@ impl base::BangProcMacro for BangProcMacro {

let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
let strategy = exec_strategy(ecx.sess);
let server = proc_macro_server::Rustc::new(ecx);
self.client.run(&strategy, server, input, proc_macro_backtrace).map_err(|e| {
ecx.dcx().emit_err(errors::ProcMacroPanicked {
let mut server = proc_macro_server::Rustc::new(ecx);
let input = server.ts_rustc_to_pm(input);
let output = self.client.run(&strategy, &mut server, input, proc_macro_backtrace);

match output {
Ok(stream) => Ok(server.ts_pm_to_rustc(stream)),
Err(e) => Err(ecx.dcx().emit_err(errors::ProcMacroPanicked {
span,
message: e
.as_str()
.map(|message| errors::ProcMacroPanickedHelp { message: message.into() }),
})
})
})),
}
}
}

Expand All @@ -88,17 +92,20 @@ impl base::AttrProcMacro for AttrProcMacro {

let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
let strategy = exec_strategy(ecx.sess);
let server = proc_macro_server::Rustc::new(ecx);
self.client.run(&strategy, server, annotation, annotated, proc_macro_backtrace).map_err(
|e| {
ecx.dcx().emit_err(errors::CustomAttributePanicked {
span,
message: e.as_str().map(|message| errors::CustomAttributePanickedHelp {
message: message.into(),
}),
})
},
)
let mut server = proc_macro_server::Rustc::new(ecx);
let annotation = server.ts_rustc_to_pm(annotation);
let annotated = server.ts_rustc_to_pm(annotated);
let output =
self.client.run(&strategy, &mut server, annotation, annotated, proc_macro_backtrace);
match output {
Ok(stream) => Ok(server.ts_pm_to_rustc(stream)),
Err(e) => Err(ecx.dcx().emit_err(errors::CustomAttributePanicked {
span,
message: e
.as_str()
.map(|message| errors::CustomAttributePanickedHelp { message: message.into() }),
})),
}
}
}

Expand Down Expand Up @@ -221,10 +228,11 @@ fn expand_derive_macro(

let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
let strategy = exec_strategy(ecx.sess);
let server = proc_macro_server::Rustc::new(ecx);
let mut server = proc_macro_server::Rustc::new(ecx);
let input = server.ts_rustc_to_pm(input);

match client.run(&strategy, server, input, proc_macro_backtrace) {
Ok(stream) => Ok(stream),
match client.run(&strategy, &mut server, input, proc_macro_backtrace) {
Ok(stream) => Ok(server.ts_pm_to_rustc(stream)),
Err(e) => {
let invoc_expn_data = invoc_id.expn_data();
let span = invoc_expn_data.call_site;
Expand Down
Loading
Loading