Skip to content

Commit e187c30

Browse files
committed
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!`)
2 parents 7b4dcb5 + 657b06d commit e187c30

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

crates/proc-macro-srv/src/dylib/proc_macros.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl ProcMacros {
3030
if *trait_name == macro_name =>
3131
{
3232
let res = client.run(
33-
&bridge::server::SameThread,
33+
&bridge::server::SAME_THREAD,
3434
S::make_server(call_site, def_site, mixed_site, callback),
3535
macro_body,
3636
cfg!(debug_assertions),
@@ -39,7 +39,7 @@ impl ProcMacros {
3939
}
4040
bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => {
4141
let res = client.run(
42-
&bridge::server::SameThread,
42+
&bridge::server::SAME_THREAD,
4343
S::make_server(call_site, def_site, mixed_site, callback),
4444
macro_body,
4545
cfg!(debug_assertions),
@@ -48,7 +48,7 @@ impl ProcMacros {
4848
}
4949
bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => {
5050
let res = client.run(
51-
&bridge::server::SameThread,
51+
&bridge::server::SAME_THREAD,
5252
S::make_server(call_site, def_site, mixed_site, callback),
5353
parsed_attributes,
5454
macro_body,

0 commit comments

Comments
 (0)