Unnamed repository; edit this file 'description' to name the repository.
Merge ref '139651428df8' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@139651428df86cf88443295542c12ea617cbb587
Filtered ref: rust-lang/rust-analyzer@3efb0c2db4b74a7d58902fd4b88d5f04f20a9bfe
Upstream diff: https://github.com/rust-lang/rust/compare/ba284f468cd2cda48420251efc991758ec13d450...139651428df86cf88443295542c12ea617cbb587
This merge was created using https://github.com/rust-lang/josh-sync.
| -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, |