syntax: use MetaPath (a simpler version of Path) for Attribute and MetaItem.

Author: eddyb

src/librustc/ich/impls_syntax.rs

@@ -221,13 +221,13 @@ impl<'a> HashStable<StableHashingContext<'a>> for [ast::Attribute] {
     }
 }
 
-impl<'a> HashStable<StableHashingContext<'a>> for ast::Path {
+impl<'a> HashStable<StableHashingContext<'a>> for ast::MetaPath {
     fn hash_stable<W: StableHasherResult>(&self,
                                           hcx: &mut StableHashingContext<'a>,
                                           hasher: &mut StableHasher<W>) {
         self.segments.len().hash_stable(hcx, hasher);
-        for segment in &self.segments {
-            segment.ident.name.hash_stable(hcx, hasher);
+        for ident in &self.segments {
+            ident.name.hash_stable(hcx, hasher);
         }
     }
 }

src/librustc_driver/lib.rs

@@ -1071,7 +1071,7 @@ impl RustcDefaultCalls {
 
                     let mut cfgs = sess.parse_sess.config.iter().filter_map(|&(name, ref value)| {
                         let gated_cfg = GatedCfg::gate(&ast::MetaItem {
-                            path: ast::Path::from_ident(ast::Ident::with_empty_ctxt(name)),
+                            path: ast::MetaPath::from_ident(ast::Ident::with_empty_ctxt(name)),
                             node: ast::MetaItemKind::Word,
                             span: DUMMY_SP,
                         });

src/librustc_resolve/build_reduced_graph.rs

@@ -1021,7 +1021,7 @@ impl<'a, 'b, 'cl> Visitor<'a> for BuildReducedGraphVisitor<'a, 'b, 'cl> {
                 derives: Vec::new(),
             };
             parent_scope.module.builtin_attrs.borrow_mut().push((
-                attr.path.segments[0].ident, parent_scope
+                attr.path.segments[0], parent_scope
             ));
         }
         visit::walk_attribute(self, attr);

src/librustc_resolve/macros.rs

@@ -299,7 +299,7 @@ impl<'a, 'crateloader: 'a> base::Resolver for Resolver<'a, 'crateloader> {
                         }).into();
                     }
                     return Some(ast::Attribute {
-                        path: ast::Path::from_ident(Ident::new(legacy_name, span)),
+                        path: ast::MetaPath::from_ident(Ident::new(legacy_name, span)),
                         tokens: TokenStream::empty(),
                         id: attr::mk_attr_id(),
                         style: ast::AttrStyle::Outer,
@@ -315,11 +315,14 @@ impl<'a, 'crateloader: 'a> base::Resolver for Resolver<'a, 'crateloader> {
 
     fn resolve_macro_invocation(&mut self, invoc: &Invocation, invoc_id: Mark, force: bool)
                                 -> Result<Option<Lrc<SyntaxExtension>>, Determinacy> {
+        let path;
         let (path, kind, derives_in_scope, after_derive) = match invoc.kind {
             InvocationKind::Attr { attr: None, .. } =>
                 return Ok(None),
-            InvocationKind::Attr { attr: Some(ref attr), ref traits, after_derive, .. } =>
-                (&attr.path, MacroKind::Attr, traits.clone(), after_derive),
+            InvocationKind::Attr { attr: Some(ref attr), ref traits, after_derive, .. } => {
+                path = attr.path.to_regular_path();
+                (&path, MacroKind::Attr, traits.clone(), after_derive)
+            }
             InvocationKind::Bang { ref mac, .. } =>
                 (&mac.node.path, MacroKind::Bang, Vec::new(), false),
             InvocationKind::Derive { ref path, .. } =>

src/libsyntax/ast.rs

@@ -63,6 +63,66 @@ impl fmt::Debug for Lifetime {
     }
 }
 
+/// Simpler version of `Path` for `Attribute` and `MetaItem`.
+#[derive(Clone, RustcEncodable, RustcDecodable)]
+pub struct MetaPath {
+    pub span: Span,
+    pub segments: Vec<Ident>,
+}
+
+impl<'a> PartialEq<&'a str> for MetaPath {
+    fn eq(&self, string: &&'a str) -> bool {
+        self.segments.len() == 1 && self.segments[0].name == *string
+    }
+}
+
+impl fmt::Debug for MetaPath {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "path({})", pprust::meta_path_to_string(self))
+    }
+}
+
+impl fmt::Display for MetaPath {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", pprust::meta_path_to_string(self))
+    }
+}
+
+impl MetaPath {
+    // convert a span and an identifier to the corresponding
+    // 1-segment path
+    pub fn from_ident(ident: Ident) -> MetaPath {
+        MetaPath {
+            span: ident.span,
+            segments: vec![ident],
+        }
+    }
+
+    /// Try to convert a `Path` into a `MetaPath`, returning `None`
+    /// if any of the path's segments had any generic arguments.
+    pub fn from_regular_path(path: &Path) -> Option<MetaPath> {
+        Some(MetaPath {
+            span: path.span,
+            segments: path.segments.iter().map(|segment| {
+                if segment.args.is_none() {
+                    Some(segment.ident)
+                } else {
+                    None
+                }
+            }).collect::<Option<_>>()?,
+        })
+    }
+
+    pub fn to_regular_path(&self) -> Path {
+        Path {
+            span: self.span,
+            segments: self.segments.iter().map(|&ident| {
+                PathSegment::from_ident(ident)
+            }).collect(),
+        }
+    }
+}
+
 /// A "Path" is essentially Rust's notion of a name.
 ///
 /// It's represented as a sequence of identifiers,
@@ -430,7 +490,7 @@ pub enum NestedMetaItemKind {
 /// E.g. `#[test]`, `#[derive(..)]`, `#[rustfmt::skip]` or `#[feature = "foo"]`
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct MetaItem {
-    pub path: Path,
+    pub path: MetaPath,
     pub node: MetaItemKind,
     pub span: Span,
 }
@@ -1988,7 +2048,7 @@ impl Idx for AttrId {
 pub struct Attribute {
     pub id: AttrId,
     pub style: AttrStyle,
-    pub path: Path,
+    pub path: MetaPath,
     pub tokens: TokenStream,
     pub is_sugared_doc: bool,
     pub span: Span,

src/libsyntax/attr/mod.rs

@@ -22,7 +22,7 @@ pub use self::ReprAttr::*;
 pub use self::StabilityLevel::*;
 
 use ast;
-use ast::{AttrId, Attribute, AttrStyle, Name, Ident, Path, PathSegment};
+use ast::{AttrId, Attribute, AttrStyle, Name, Ident, MetaPath};
 use ast::{MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind};
 use ast::{Lit, LitKind, Expr, ExprKind, Item, Local, Stmt, StmtKind, GenericParam};
 use source_map::{BytePos, Spanned, respan, dummy_spanned};
@@ -166,8 +166,8 @@ impl NestedMetaItem {
     }
 }
 
-fn name_from_path(path: &Path) -> Name {
-    path.segments.last().expect("empty path in attribute").ident.name
+fn name_from_path(path: &MetaPath) -> Name {
+    path.segments.last().expect("empty path in attribute").name
 }
 
 impl Attribute {
@@ -270,7 +270,7 @@ impl MetaItem {
 
     pub fn is_scoped(&self) -> Option<Ident> {
         if self.path.segments.len() > 1 {
-            Some(self.path.segments[0].ident)
+            Some(self.path.segments[0])
         } else {
             None
         }
@@ -366,15 +366,15 @@ pub fn mk_name_value_item_str(ident: Ident, value: Spanned<Symbol>) -> MetaItem
 }
 
 pub fn mk_name_value_item(span: Span, ident: Ident, value: ast::Lit) -> MetaItem {
-    MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
+    MetaItem { path: MetaPath::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
 }
 
 pub fn mk_list_item(span: Span, ident: Ident, items: Vec<NestedMetaItem>) -> MetaItem {
-    MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::List(items) }
+    MetaItem { path: MetaPath::from_ident(ident), span, node: MetaItemKind::List(items) }
 }
 
 pub fn mk_word_item(ident: Ident) -> MetaItem {
-    MetaItem { path: Path::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
+    MetaItem { path: MetaPath::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
 }
 
 pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
@@ -432,7 +432,7 @@ pub fn mk_sugared_doc_attr(id: AttrId, text: Symbol, span: Span) -> Attribute {
     Attribute {
         id,
         style,
-        path: Path::from_ident(Ident::from_str("doc").with_span_pos(span)),
+        path: MetaPath::from_ident(Ident::from_str("doc").with_span_pos(span)),
         tokens: MetaItemKind::NameValue(lit).tokens(span),
         is_sugared_doc: true,
         span,
@@ -470,17 +470,17 @@ impl MetaItem {
     fn tokens(&self) -> TokenStream {
         let mut idents = vec![];
         let mut last_pos = BytePos(0 as u32);
-        for (i, segment) in self.path.segments.iter().enumerate() {
+        for (i, &ident) in self.path.segments.iter().enumerate() {
             let is_first = i == 0;
             if !is_first {
                 let mod_sep_span = Span::new(last_pos,
-                                             segment.ident.span.lo(),
-                                             segment.ident.span.ctxt());
+                                             ident.span.lo(),
+                                             ident.span.ctxt());
                 idents.push(TokenTree::Token(mod_sep_span, Token::ModSep).into());
             }
-            idents.push(TokenTree::Token(segment.ident.span,
-                                         Token::from_ast_ident(segment.ident)).into());
-            last_pos = segment.ident.span.hi();
+            idents.push(TokenTree::Token(ident.span,
+                                         Token::from_ast_ident(ident)).into());
+            last_pos = ident.span.hi();
         }
         idents.push(self.node.tokens(self.span));
         TokenStream::concat(idents)
@@ -493,12 +493,12 @@ impl MetaItem {
         let path = match tokens.next() {
             Some(TokenTree::Token(span, Token::Ident(ident, _))) => {
                 if let Some(TokenTree::Token(_, Token::ModSep)) = tokens.peek() {
-                    let mut segments = vec![PathSegment::from_ident(ident.with_span_pos(span))];
+                    let mut segments = vec![ident.with_span_pos(span)];
                     tokens.next();
                     loop {
                         if let Some(TokenTree::Token(span,
                                                      Token::Ident(ident, _))) = tokens.next() {
-                            segments.push(PathSegment::from_ident(ident.with_span_pos(span)));
+                            segments.push(ident.with_span_pos(span));
                         } else {
                             return None;
                         }
@@ -508,16 +508,18 @@ impl MetaItem {
                             break;
                         }
                     }
-                    let span = span.with_hi(segments.last().unwrap().ident.span.hi());
-                    Path { span, segments }
+                    let span = span.with_hi(segments.last().unwrap().span.hi());
+                    MetaPath { span, segments }
                 } else {
-                    Path::from_ident(ident.with_span_pos(span))
+                    MetaPath::from_ident(ident.with_span_pos(span))
                 }
             }
             Some(TokenTree::Token(_, Token::Interpolated(ref nt))) => match nt.0 {
-                token::Nonterminal::NtIdent(ident, _) => Path::from_ident(ident),
+                token::Nonterminal::NtIdent(ident, _) => MetaPath::from_ident(ident),
                 token::Nonterminal::NtMeta(ref meta) => return Some(meta.clone()),
-                token::Nonterminal::NtPath(ref path) => path.clone(),
+                token::Nonterminal::NtPath(ref path) => {
+                    ast::MetaPath::from_regular_path(path)?
+                }
                 _ => return None,
             },
             _ => return None,

src/libsyntax/ext/expand.rs

@@ -601,7 +601,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                 let input = self.extract_proc_macro_attr_input(attr.tokens, attr.span);
                 let tok_result = mac.expand(self.cx, attr.span, input, item_tok);
                 let res = self.parse_ast_fragment(tok_result, invoc.fragment_kind,
-                                                  &attr.path, attr.span);
+                                                  &attr.path.to_regular_path(), attr.span);
                 self.gate_proc_macro_expansion(attr.span, &res);
                 res
             }
@@ -928,7 +928,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                 invoc.expansion_data.mark.set_expn_info(expn_info);
                 let span = span.with_ctxt(self.cx.backtrace());
                 let dummy = ast::MetaItem { // FIXME(jseyfried) avoid this
-                    path: Path::from_ident(keywords::Invalid.ident()),
+                    path: ast::MetaPath::from_ident(keywords::Invalid.ident()),
                     span: DUMMY_SP,
                     node: ast::MetaItemKind::Word,
                 };

src/libsyntax/ext/quote.rs

@@ -235,12 +235,12 @@ pub mod rt {
                 r.push(TokenTree::Token(self.span, token::Not));
             }
             let mut inner = Vec::new();
-            for (i, segment) in self.path.segments.iter().enumerate() {
+            for (i, &ident) in self.path.segments.iter().enumerate() {
                 if i > 0 {
                     inner.push(TokenTree::Token(self.span, token::Colon).into());
                 }
                 inner.push(TokenTree::Token(
-                    self.span, token::Token::from_ast_ident(segment.ident)
+                    self.span, token::Token::from_ast_ident(ident)
                 ).into());
             }
             inner.push(self.tokens.clone());

src/libsyntax/fold.rs

@@ -541,7 +541,7 @@ pub fn noop_fold_attribute<T: Folder>(attr: Attribute, fld: &mut T) -> Option<At
     Some(Attribute {
         id: attr.id,
         style: attr.style,
-        path: fld.fold_path(attr.path),
+        path: attr.path.clone(),
         tokens: fld.fold_tts(attr.tokens),
         is_sugared_doc: attr.is_sugared_doc,
         span: fld.new_span(attr.span),
@@ -581,7 +581,7 @@ pub fn noop_fold_meta_list_item<T: Folder>(li: NestedMetaItem, fld: &mut T)
 
 pub fn noop_fold_meta_item<T: Folder>(mi: MetaItem, fld: &mut T) -> MetaItem {
     MetaItem {
-        path: fld.fold_path(mi.path),
+        path: mi.path.clone(),
         node: match mi.node {
             MetaItemKind::Word => MetaItemKind::Word,
             MetaItemKind::List(mis) => {

src/libsyntax/parse/attr.rs

@@ -147,7 +147,7 @@ impl<'a> Parser<'a> {
     /// PATH
     /// PATH `=` TOKEN_TREE
     /// The delimiters or `=` are still put into the resulting token stream.
-    crate fn parse_meta_item_unrestricted(&mut self) -> PResult<'a, (ast::Path, TokenStream)> {
+    crate fn parse_meta_item_unrestricted(&mut self) -> PResult<'a, (ast::MetaPath, TokenStream)> {
         let meta = match self.token {
             token::Interpolated(ref nt) => match nt.0 {
                 Nonterminal::NtMeta(ref meta) => Some(meta.clone()),
@@ -174,7 +174,7 @@ impl<'a> Parser<'a> {
             } else {
                 TokenStream::empty()
             };
-            (path, tokens)
+            (ast::MetaPath::from_regular_path(&path).unwrap(), tokens)
         })
     }
 
@@ -251,7 +251,11 @@ impl<'a> Parser<'a> {
         let path = self.parse_path(PathStyle::Mod)?;
         let node = self.parse_meta_item_kind()?;
         let span = lo.to(self.prev_span);
-        Ok(ast::MetaItem { path, node, span })
+        Ok(ast::MetaItem {
+            path: ast::MetaPath::from_regular_path(&path).unwrap(),
+            node,
+            span,
+        })
     }
 
     crate fn parse_meta_item_kind(&mut self) -> PResult<'a, ast::MetaItemKind> {