more r-a fixes

Author: cyrgani

src/tools/rust-analyzer/crates/proc-macro-api/src/legacy_protocol/msg/flat.rs

@@ -607,7 +607,7 @@ impl<'a, T: SpanTransformer, U> Writer<'a, '_, T, U> {
     }
 }
 
-#[cfg(feature = "sysroot-abi")]
+//#[cfg(feature = "sysroot-abi")]
 impl<'a, T: SpanTransformer>
     Writer<'a, '_, T, Option<proc_macro_srv::TokenStreamIter<'a, T::Span>>>
 {
@@ -723,8 +723,8 @@ impl<'a, T: SpanTransformer>
         self.subtree.push(SubtreeRepr { open, close, kind: delimiter_kind, tt: [!0, !0] });
         self.work.push_back((
             idx,
-            group.stream.as_ref().map_or(0, |stream| stream.len()),
-            group.stream.as_ref().map(|ts| ts.iter()),
+            group.stream.as_ref().map_or(0, |stream| stream.trees.len()),
+            group.stream.clone().map(|ts| TokenStream::from_bridge(ts).iter()),
         ));
         idx as u32
     }
@@ -955,7 +955,7 @@ impl<T: SpanTransformer> Reader<'_, T> {
                     tt::DelimiterKind::Bracket => proc_macro_srv::Delimiter::Bracket,
                     tt::DelimiterKind::Invisible => proc_macro_srv::Delimiter::None,
                 },
-                stream: if stream.is_empty() { None } else { Some(TokenStream::new(stream)) },
+                stream: if stream.is_empty() { None } else { Some(TokenStream::new(stream).into_bridge()) },
                 span: proc_macro_srv::DelimSpan {
                     open,
                     close,
@@ -967,7 +967,7 @@ impl<T: SpanTransformer> Reader<'_, T> {
         }
         let group = res[0].take().unwrap();
         if group.delimiter == proc_macro_srv::Delimiter::None {
-            group.stream.unwrap_or_default()
+            TokenStream::from_bridge(group.stream.unwrap_or_default())
         } else {
             TokenStream::new(vec![proc_macro_srv::TokenTree::Group(group)])
         }

src/tools/rust-analyzer/crates/proc-macro-srv/src/dylib/proc_macros.rs

@@ -32,29 +32,29 @@ impl ProcMacros {
                     let res = client.run(
                         &bridge::server::SameThread,
                         S::make_server(call_site, def_site, mixed_site, callback),
-                        macro_body,
+                        macro_body.into_bridge(),
                         cfg!(debug_assertions),
                     );
-                    return res.map_err(crate::PanicMessage::from);
+                    return res.map(TokenStream::from_bridge).map_err(crate::PanicMessage::from);
                 }
                 bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => {
                     let res = client.run(
                         &bridge::server::SameThread,
                         S::make_server(call_site, def_site, mixed_site, callback),
-                        macro_body,
+                        macro_body.into_bridge(),
                         cfg!(debug_assertions),
                     );
-                    return res.map_err(crate::PanicMessage::from);
+                    return res.map(TokenStream::from_bridge).map_err(crate::PanicMessage::from);
                 }
                 bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => {
                     let res = client.run(
                         &bridge::server::SameThread,
                         S::make_server(call_site, def_site, mixed_site, callback),
-                        parsed_attributes,
-                        macro_body,
+                        parsed_attributes.into_bridge(),
+                        macro_body.into_bridge(),
                         cfg!(debug_assertions),
                     );
-                    return res.map_err(crate::PanicMessage::from);
+                    return res.map(TokenStream::from_bridge).map_err(crate::PanicMessage::from);
                 }
                 _ => continue,
             }

src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs

@@ -10,7 +10,7 @@
 //! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable`
 //!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
 
-#![cfg(feature = "sysroot-abi")]
+//#![cfg(feature = "sysroot-abi")]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 #![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
 #![allow(
@@ -233,7 +233,7 @@ impl ProcMacroSrv<'_> {
 }
 
 pub trait ProcMacroSrvSpan: Copy + Send + Sync {
-    type Server<'a>: rustc_proc_macro::bridge::server::Server;
+    type Server<'a>: rustc_proc_macro::bridge::server::Server<Span = Self, Symbol = intern::Symbol>;
     fn make_server<'a>(
         call_site: Self,
         def_site: Self,

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs

@@ -15,7 +15,7 @@ use span::{FIXUP_ERASED_FILE_AST_ID_MARKER, Span, TextRange, TextSize};
 
 use crate::{
     ProcMacroClientHandle,
-    bridge::{Diagnostic, ExpnGlobals, Literal, TokenTree},
+    bridge::{Diagnostic, ExpnGlobals, Literal},
     server_impl::literal_from_str,
 };
 

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs

@@ -10,7 +10,7 @@ use rustc_proc_macro::bridge::server;
 
 use crate::{
     ProcMacroClientHandle,
-    bridge::{Diagnostic, ExpnGlobals, Literal, TokenTree},
+    bridge::{Diagnostic, ExpnGlobals, Literal},
     server_impl::literal_from_str,
 };
 

src/tools/rust-analyzer/crates/proc-macro-srv/src/token_stream.rs

@@ -1,7 +1,7 @@
 //! The proc-macro server token stream implementation.
 
 use core::fmt;
-use std::{mem, sync::Arc, rc::Rc};
+use std::{mem, sync::Arc};
 
 use intern::Symbol;
 use rustc_lexer::{DocStyle, LiteralKind};
@@ -29,7 +29,7 @@ impl<S> TokenStream<S> {
     }
 
     pub fn from_bridge(ts: BridgeTokenStream<S>) -> TokenStream<S> where S: Clone {
-        TokenStream::new(Rc::unwrap_or_clone(ts.trees))
+        TokenStream::new(Arc::unwrap_or_clone(ts.trees))
     }
 
     pub fn into_bridge(self) -> BridgeTokenStream<S> where S: Clone {