Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #152627 - JonathanBrouwer:rollup-wjHXhK0, r=JonathanBrouwer
Rollup of 8 pull requests
Successful merges:
- rust-lang/rust#152618 (stdarch subtree update)
- rust-lang/rust#152001 (mGCA: Validate const literal against expected type)
- rust-lang/rust#152120 (Don't ICE on layout error in vtable computation)
- rust-lang/rust#152531 (`proc_macro::bridge`: simplify `ExecutionStrategy` and `DispatcherTrait`)
- rust-lang/rust#152577 (Port #[rustc_proc_macro_decls] to the new attribute parser.)
- rust-lang/rust#152570 (Port #[rustc_test_marker] to the attribute parser)
- rust-lang/rust#152590 (DepGraphQuery: correctly skip adding edges with not-yet-added nodes)
- rust-lang/rust#152612 (Rename `inline_fluent!` to `msg!`)
| -rw-r--r-- | crates/proc-macro-srv/src/dylib/proc_macros.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/proc-macro-srv/src/dylib/proc_macros.rs b/crates/proc-macro-srv/src/dylib/proc_macros.rs index 76c5097101..4065dbd0b4 100644 --- a/crates/proc-macro-srv/src/dylib/proc_macros.rs +++ b/crates/proc-macro-srv/src/dylib/proc_macros.rs @@ -30,7 +30,7 @@ impl ProcMacros { if *trait_name == macro_name => { let res = client.run( - &bridge::server::SameThread, + &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, callback), macro_body, cfg!(debug_assertions), @@ -39,7 +39,7 @@ impl ProcMacros { } bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => { let res = client.run( - &bridge::server::SameThread, + &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, callback), macro_body, cfg!(debug_assertions), @@ -48,7 +48,7 @@ impl ProcMacros { } bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => { let res = client.run( - &bridge::server::SameThread, + &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, callback), parsed_attributes, macro_body, |