Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #21541 from rust-lang/rustc-pull
Rustc pull update
| -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 | ||||
| -rw-r--r-- | rust-version | 2 |
4 files changed, 4 insertions, 8 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 f558b600e0..c114d52ec3 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, diff --git a/rust-version b/rust-version index 17b678eed9..a1011c4a0a 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -94a0cd15f5976fa35e5e6784e621c04e9f958e57 +ba284f468cd2cda48420251efc991758ec13d450 |