Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #151749 - JonathanBrouwer:rollup-IRCTaVD, r=JonathanBrouwer
Rollup of 4 pull requests
Successful merges:
- rust-lang/rust#151161 (std: move time implementations to `sys`)
- rust-lang/rust#151694 (more `proc_macro` bridge cleanups)
- rust-lang/rust#151711 (stdarch subtree update)
- rust-lang/rust#150557 (Don't try to evaluate const blocks during constant promotion)
| -rw-r--r-- | crates/proc-macro-srv/src/dylib.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs | 4 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/server_impl/token_id.rs | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/crates/proc-macro-srv/src/dylib.rs b/crates/proc-macro-srv/src/dylib.rs index 8680e9180e..9a65538675 100644 --- a/crates/proc-macro-srv/src/dylib.rs +++ b/crates/proc-macro-srv/src/dylib.rs @@ -48,7 +48,7 @@ impl Expander { callback: Option<ProcMacroClientHandle<'_>>, ) -> Result<TokenStream<S>, PanicMessage> where - <S::Server<'a> as bridge::server::Types>::TokenStream: Default, + <S::Server<'a> as bridge::server::Server>::TokenStream: Default, { self.inner .proc_macros diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs index ec30630c10..eacb100fbc 100644 --- a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs +++ b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs @@ -30,13 +30,11 @@ pub struct RaSpanServer<'a> { pub callback: Option<ProcMacroClientHandle<'a>>, } -impl server::Types for RaSpanServer<'_> { +impl server::Server for RaSpanServer<'_> { type TokenStream = crate::token_stream::TokenStream<Span>; type Span = Span; type Symbol = Symbol; -} -impl server::Server for RaSpanServer<'_> { fn globals(&mut self) -> ExpnGlobals<Self::Span> { ExpnGlobals { def_site: self.def_site, diff --git a/crates/proc-macro-srv/src/server_impl/token_id.rs b/crates/proc-macro-srv/src/server_impl/token_id.rs index 3bf07290c8..70484c4dc2 100644 --- a/crates/proc-macro-srv/src/server_impl/token_id.rs +++ b/crates/proc-macro-srv/src/server_impl/token_id.rs @@ -36,13 +36,11 @@ pub struct SpanIdServer<'a> { pub callback: Option<ProcMacroClientHandle<'a>>, } -impl server::Types for SpanIdServer<'_> { +impl server::Server for SpanIdServer<'_> { type TokenStream = crate::token_stream::TokenStream<Span>; type Span = Span; type Symbol = Symbol; -} -impl server::Server for SpanIdServer<'_> { fn globals(&mut self) -> ExpnGlobals<Self::Span> { ExpnGlobals { def_site: self.def_site, |