Add mod-style printing for paths that cannot contain generic args

dtolnay · Aug 16, 2024 · 3bb65aa · 3bb65aa
1 parent ae8c84a
commit 3bb65aa
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/src/attr.rs b/src/attr.rs
@@ -776,6 +776,7 @@ pub(crate) mod parsing {
 #[cfg(feature = "printing")]
 mod printing {
     use crate::attr::{AttrStyle, Attribute, Meta, MetaList, MetaNameValue};
+    use crate::path;
     use proc_macro2::TokenStream;
     use quote::ToTokens;
 
@@ -796,25 +797,25 @@ mod printing {
     impl ToTokens for Meta {
         fn to_tokens(&self, tokens: &mut TokenStream) {
             match self {
-                Meta::Path(meta) => meta.to_tokens(tokens),
-                Meta::List(meta) => meta.to_tokens(tokens),
-                Meta::NameValue(meta) => meta.to_tokens(tokens),
+                Meta::Path(path) => path::printing::print_mod_style(tokens, path),
+                Meta::List(meta_list) => meta_list.to_tokens(tokens),
+                Meta::NameValue(meta_name_value) => meta_name_value.to_tokens(tokens),
             }
         }
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "printing")))]
     impl ToTokens for MetaList {
         fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
+            path::printing::print_mod_style(tokens, &self.path);
             self.delimiter.surround(tokens, self.tokens.clone());
         }
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "printing")))]
     impl ToTokens for MetaNameValue {
         fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
+            path::printing::print_mod_style(tokens, &self.path);
             self.eq_token.to_tokens(tokens);
             self.value.to_tokens(tokens);
         }

diff --git a/src/item.rs b/src/item.rs
@@ -2894,6 +2894,7 @@ mod printing {
         UsePath, UseRename, Variadic,
     };
     use crate::mac::MacroDelimiter;
+    use crate::path;
     use crate::print::TokensOrDefault;
     use crate::ty::Type;
     use proc_macro2::TokenStream;
@@ -3135,7 +3136,7 @@ mod printing {
     impl ToTokens for ItemMacro {
         fn to_tokens(&self, tokens: &mut TokenStream) {
             tokens.append_all(self.attrs.outer());
-            self.mac.path.to_tokens(tokens);
+            path::printing::print_mod_style(tokens, &self.mac.path);
             self.mac.bang_token.to_tokens(tokens);
             self.ident.to_tokens(tokens);
             match &self.mac.delimiter {

diff --git a/src/mac.rs b/src/mac.rs
@@ -197,6 +197,7 @@ pub(crate) mod parsing {
 #[cfg(feature = "printing")]
 mod printing {
     use crate::mac::{Macro, MacroDelimiter};
+    use crate::path;
     use crate::token;
     use proc_macro2::{Delimiter, TokenStream};
     use quote::ToTokens;
@@ -215,7 +216,7 @@ mod printing {
     #[cfg_attr(docsrs, doc(cfg(feature = "printing")))]
     impl ToTokens for Macro {
         fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
+            path::printing::print_mod_style(tokens, &self.path);
             self.bang_token.to_tokens(tokens);
             self.delimiter.surround(tokens, self.tokens.clone());
         }

diff --git a/src/path.rs b/src/path.rs
@@ -867,6 +867,14 @@ pub(crate) mod printing {
         }
     }
 
+    pub(crate) fn print_mod_style(tokens: &mut TokenStream, path: &Path) {
+        path.leading_colon.to_tokens(tokens);
+        for segment in path.segments.pairs() {
+            segment.value().ident.to_tokens(tokens);
+            segment.punct().to_tokens(tokens);
+        }
+    }
+
     #[cfg(feature = "parsing")]
     #[cfg_attr(docsrs, doc(cfg(all(feature = "parsing", feature = "printing"))))]
     impl Spanned for QSelf {

diff --git a/src/restriction.rs b/src/restriction.rs
@@ -146,6 +146,7 @@ pub(crate) mod parsing {
 
 #[cfg(feature = "printing")]
 mod printing {
+    use crate::path;
     use crate::restriction::{VisRestricted, Visibility};
     use proc_macro2::TokenStream;
     use quote::ToTokens;
@@ -169,7 +170,7 @@ mod printing {
                 // TODO: If we have a path which is not "self" or "super" or
                 // "crate", automatically add the "in" token.
                 self.in_token.to_tokens(tokens);
-                self.path.to_tokens(tokens);
+                path::printing::print_mod_style(tokens, &self.path);
             });
         }
     }