Fix review comments

Author: bjorn3

compiler/rustc_expand/src/proc_macro_server.rs

@@ -566,19 +566,19 @@ impl server::Server for Rustc<'_, '_> {
         diag.emit();
     }
 
-    fn tt_drop(&mut self, stream: Self::TokenStream) {
+    fn ts_drop(&mut self, stream: Self::TokenStream) {
         drop(stream);
     }
 
-    fn tt_clone(&mut self, stream: &Self::TokenStream) -> Self::TokenStream {
+    fn ts_clone(&mut self, stream: &Self::TokenStream) -> Self::TokenStream {
         stream.clone()
     }
 
-    fn tt_is_empty(&mut self, stream: &Self::TokenStream) -> bool {
+    fn ts_is_empty(&mut self, stream: &Self::TokenStream) -> bool {
         stream.is_empty()
     }
 
-    fn tt_from_str(&mut self, src: &str) -> Self::TokenStream {
+    fn ts_from_str(&mut self, src: &str) -> Self::TokenStream {
         unwrap_or_emit_fatal(source_str_to_stream(
             self.psess(),
             FileName::proc_macro_source_code(src),
@@ -587,11 +587,11 @@ impl server::Server for Rustc<'_, '_> {
         ))
     }
 
-    fn tt_to_string(&mut self, stream: &Self::TokenStream) -> String {
+    fn ts_to_string(&mut self, stream: &Self::TokenStream) -> String {
         pprust::tts_to_string(stream)
     }
 
-    fn tt_expand_expr(&mut self, stream: &Self::TokenStream) -> Result<Self::TokenStream, ()> {
+    fn ts_expand_expr(&mut self, stream: &Self::TokenStream) -> Result<Self::TokenStream, ()> {
         // Parse the expression from our tokenstream.
         let expr: PResult<'_, _> = try {
             let mut p = Parser::new(self.psess(), stream.clone(), Some("proc_macro expand expr"));
@@ -652,14 +652,14 @@ impl server::Server for Rustc<'_, '_> {
         }
     }
 
-    fn tt_from_token_tree(
+    fn ts_from_token_tree(
         &mut self,
         tree: TokenTree<Self::TokenStream, Self::Span, Self::Symbol>,
     ) -> Self::TokenStream {
         Self::TokenStream::new((tree, &mut *self).to_internal().into_iter().collect::<Vec<_>>())
     }
 
-    fn tt_concat_trees(
+    fn ts_concat_trees(
         &mut self,
         base: Option<Self::TokenStream>,
         trees: Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
@@ -673,7 +673,7 @@ impl server::Server for Rustc<'_, '_> {
         stream
     }
 
-    fn tt_concat_streams(
+    fn ts_concat_streams(
         &mut self,
         base: Option<Self::TokenStream>,
         streams: Vec<Self::TokenStream>,
@@ -685,7 +685,7 @@ impl server::Server for Rustc<'_, '_> {
         stream
     }
 
-    fn tt_into_trees(
+    fn ts_into_trees(
         &mut self,
         stream: Self::TokenStream,
     ) -> Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>> {

library/proc_macro/src/bridge/client.rs

@@ -25,7 +25,7 @@ impl !Sync for TokenStream {}
 // Forward `Drop::drop` to the inherent `drop` method.
 impl Drop for TokenStream {
     fn drop(&mut self) {
-        Methods::tt_drop(TokenStream { handle: self.handle });
+        Methods::ts_drop(TokenStream { handle: self.handle });
     }
 }
 
@@ -75,7 +75,7 @@ impl<S> Decode<'_, '_, S> for Span {
 
 impl Clone for TokenStream {
     fn clone(&self) -> Self {
-        Methods::tt_clone(self)
+        Methods::ts_clone(self)
     }
 }
 

library/proc_macro/src/bridge/mod.rs

@@ -56,24 +56,24 @@ macro_rules! with_api {
                 fn literal_from_str(s: &str) -> Result<Literal<$S::Span, $S::Symbol>, ()>;
                 fn emit_diagnostic(diagnostic: Diagnostic<$S::Span>);
 
-                fn tt_drop(stream: $S::TokenStream);
-                fn tt_clone(stream: &$S::TokenStream) -> $S::TokenStream;
-                fn tt_is_empty(stream: &$S::TokenStream) -> bool;
-                fn tt_expand_expr(stream: &$S::TokenStream) -> Result<$S::TokenStream, ()>;
-                fn tt_from_str(src: &str) -> $S::TokenStream;
-                fn tt_to_string(stream: &$S::TokenStream) -> String;
-                fn tt_from_token_tree(
+                fn ts_drop(stream: $S::TokenStream);
+                fn ts_clone(stream: &$S::TokenStream) -> $S::TokenStream;
+                fn ts_is_empty(stream: &$S::TokenStream) -> bool;
+                fn ts_expand_expr(stream: &$S::TokenStream) -> Result<$S::TokenStream, ()>;
+                fn ts_from_str(src: &str) -> $S::TokenStream;
+                fn ts_to_string(stream: &$S::TokenStream) -> String;
+                fn ts_from_token_tree(
                     tree: TokenTree<$S::TokenStream, $S::Span, $S::Symbol>,
                 ) -> $S::TokenStream;
-                fn tt_concat_trees(
+                fn ts_concat_trees(
                     base: Option<$S::TokenStream>,
                     trees: Vec<TokenTree<$S::TokenStream, $S::Span, $S::Symbol>>,
                 ) -> $S::TokenStream;
-                fn tt_concat_streams(
+                fn ts_concat_streams(
                     base: Option<$S::TokenStream>,
                     streams: Vec<$S::TokenStream>,
                 ) -> $S::TokenStream;
-                fn tt_into_trees(
+                fn ts_into_trees(
                     stream: $S::TokenStream
                 ) -> Vec<TokenTree<$S::TokenStream, $S::Span, $S::Symbol>>;