Refactor away variant hir::PathListItem_::Mod

jseyfried · jseyfried · commit c4d577be1acf · 2016-08-21T22:59:39.000Z
and refacotor `hir::PathListItem_::Ident` -&gt; `hir::PathListItem_`.
diff --git a/src/librustc/hir/fold.rs b/src/librustc/hir/fold.rs
@@ -271,16 +271,10 @@ pub fn noop_fold_view_path<T: Folder>(view_path: P<ViewPath>, fld: &mut T) -> P<
                     ViewPathList(fld.fold_path(path),
                                  path_list_idents.move_map(|path_list_ident| {
                                      Spanned {
-                                         node: match path_list_ident.node {
-                                             PathListIdent { id, name, rename } => PathListIdent {
-                                                 id: fld.new_id(id),
-                                                 name: name,
-                                                 rename: rename,
-                                             },
-                                             PathListMod { id, rename } => PathListMod {
-                                                 id: fld.new_id(id),
-                                                 rename: rename,
-                                             },
+                                         node: PathListItem_ {
+                                             id: fld.new_id(path_list_ident.node.id),
+                                             name: path_list_ident.node.name,
+                                             rename: path_list_ident.node.rename,
                                          },
                                          span: fld.new_span(path_list_ident.span),
                                      }
diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs
@@ -444,12 +444,12 @@ pub fn walk_path<'v, V: Visitor<'v>>(visitor: &mut V, path: &'v Path) {
     }
 }
 
-pub fn walk_path_list_item<'v, V: Visitor<'v>>(visitor: &mut V,
-                                               _prefix: &'v Path,
-                                               item: &'v PathListItem) {
-    visitor.visit_id(item.node.id());
-    walk_opt_name(visitor, item.span, item.node.name());
-    walk_opt_name(visitor, item.span, item.node.rename());
+pub fn walk_path_list_item<'v, V>(visitor: &mut V, _prefix: &'v Path, item: &'v PathListItem)
+    where V: Visitor<'v>,
+{
+    visitor.visit_id(item.node.id);
+    visitor.visit_name(item.span, item.node.name);
+    walk_opt_name(visitor, item.span, item.node.rename);
 }
 
 pub fn walk_path_segment<'v, V: Visitor<'v>>(visitor: &mut V,
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
@@ -218,7 +218,7 @@ impl<'a> LoweringContext<'a> {
 
     fn lower_path_list_item(&mut self, path_list_ident: &PathListItem) -> hir::PathListItem {
         Spanned {
-            node: hir::PathListIdent {
+            node: hir::PathListItem_ {
                 id: path_list_ident.node.id,
                 name: path_list_ident.node.name.name,
                 rename: path_list_ident.node.rename.map(|rename| rename.name),
diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs
@@ -120,7 +120,7 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> {
                     match view_path.node {
                         ViewPathList(_, ref paths) => {
                             for path in paths {
-                                this.insert(path.node.id(), NodeItem(i));
+                                this.insert(path.node.id, NodeItem(i));
                             }
                         }
                         _ => ()
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
@@ -20,7 +20,6 @@ pub use self::FunctionRetTy::*;
 pub use self::ForeignItem_::*;
 pub use self::Item_::*;
 pub use self::Mutability::*;
-pub use self::PathListItem_::*;
 pub use self::PrimTy::*;
 pub use self::Stmt_::*;
 pub use self::TraitItem_::*;
@@ -1337,39 +1336,11 @@ pub struct Variant_ {
 pub type Variant = Spanned<Variant_>;
 
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
-pub enum PathListItem_ {
-    PathListIdent {
-        name: Name,
-        /// renamed in list, eg `use foo::{bar as baz};`
-        rename: Option<Name>,
-        id: NodeId,
-    },
-    PathListMod {
-        /// renamed in list, eg `use foo::{self as baz};`
-        rename: Option<Name>,
-        id: NodeId,
-    },
-}
-
-impl PathListItem_ {
-    pub fn id(&self) -> NodeId {
-        match *self {
-            PathListIdent { id, .. } | PathListMod { id, .. } => id,
-        }
-    }
-
-    pub fn name(&self) -> Option<Name> {
-        match *self {
-            PathListIdent { name, .. } => Some(name),
-            PathListMod { .. } => None,
-        }
-    }
-
-    pub fn rename(&self) -> Option<Name> {
-        match *self {
-            PathListIdent { rename, .. } | PathListMod { rename, .. } => rename,
-        }
-    }
+pub struct PathListItem_ {
+    pub name: Name,
+    /// renamed in list, eg `use foo::{bar as baz};`
+    pub rename: Option<Name>,
+    pub id: NodeId,
 }
 
 pub type PathListItem = Spanned<PathListItem_>;
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
@@ -2133,16 +2133,7 @@ impl<'a> State<'a> {
                     self.print_path(path, false, 0)?;
                     word(&mut self.s, "::{")?;
                 }
-                self.commasep(Inconsistent, &segments[..], |s, w| {
-                    match w.node {
-                        hir::PathListIdent { name, .. } => {
-                            s.print_name(name)
-                        }
-                        hir::PathListMod { .. } => {
-                            word(&mut s.s, "self")
-                        }
-                    }
-                })?;
+                self.commasep(Inconsistent, &segments[..], |s, w| s.print_name(w.node.name))?;
                 word(&mut self.s, "}")
             }
         }
diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs
@@ -294,7 +294,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for MarkSymbolVisitor<'a, 'tcx> {
     }
 
     fn visit_path_list_item(&mut self, path: &hir::Path, item: &hir::PathListItem) {
-        self.lookup_and_handle_definition(item.node.id());
+        self.lookup_and_handle_definition(item.node.id);
         intravisit::walk_path_list_item(self, path, item);
     }
 }
diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs
@@ -631,7 +631,7 @@ pub fn check_path_list_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                                       cb: &mut FnMut(DefId, Span,
                                                      &Option<&Stability>,
                                                      &Option<DeprecationEntry>)) {
-    match tcx.expect_def(item.node.id()) {
+    match tcx.expect_def(item.node.id) {
         Def::PrimTy(..) => {}
         def => {
             maybe_do_stability_check(tcx, def.def_id(), item.span, cb);
diff --git a/src/librustc_lint/unused.rs b/src/librustc_lint/unused.rs
@@ -20,6 +20,7 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use syntax::ast;
 use syntax::attr::{self, AttrMetaMethods};
 use syntax::feature_gate::{KNOWN_ATTRIBUTES, AttributeType};
+use syntax::parse::token::keywords;
 use syntax::ptr::P;
 use syntax_pos::Span;
 
@@ -392,13 +393,9 @@ impl LateLintPass for UnusedImportBraces {
     fn check_item(&mut self, cx: &LateContext, item: &hir::Item) {
         if let hir::ItemUse(ref view_path) = item.node {
             if let hir::ViewPathList(_, ref items) = view_path.node {
-                if items.len() == 1 {
-                    if let hir::PathListIdent {ref name, ..} = items[0].node {
-                        let m = format!("braces around {} is unnecessary",
-                                        name);
-                        cx.span_lint(UNUSED_IMPORT_BRACES, item.span,
-                                     &m[..]);
-                    }
+                if items.len() == 1 && items[0].node.name != keywords::SelfValue.name() {
+                    let msg = format!("braces around {} is unnecessary", items[0].node.name);
+                    cx.span_lint(UNUSED_IMPORT_BRACES, item.span, &msg);
                 }
             }
         }
diff --git a/src/librustc_typeck/check_unused.rs b/src/librustc_typeck/check_unused.rs
@@ -49,7 +49,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for UnusedTraitImportVisitor<'a, 'tcx> {
                 }
                 hir::ViewPathList(_, ref path_list) => {
                     for path_item in path_list {
-                        self.check_import(path_item.node.id(), path_item.span);
+                        self.check_import(path_item.node.id, path_item.span);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -444,12 +444,12 @@ pub fn walk_path<'v, V: Visitor<'v>>(visitor: &mut V, path: &'v Path) {`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
`447`		`-pub fn walk_path_list_item<'v, V: Visitor<'v>>(visitor: &mut V,`
`448`		`- _prefix: &'v Path,`
`449`		`- item: &'v PathListItem) {`
`450`		`- visitor.visit_id(item.node.id());`
`451`		`- walk_opt_name(visitor, item.span, item.node.name());`
`452`		`- walk_opt_name(visitor, item.span, item.node.rename());`
	`447`	`+pub fn walk_path_list_item<'v, V>(visitor: &mut V, _prefix: &'v Path, item: &'v PathListItem)`
	`448`	`+ where V: Visitor<'v>,`
	`449`	`+{`
	`450`	`+ visitor.visit_id(item.node.id);`
	`451`	`+ visitor.visit_name(item.span, item.node.name);`
	`452`	`+ walk_opt_name(visitor, item.span, item.node.rename);`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`pub fn walk_path_segment<'v, V: Visitor<'v>>(visitor: &mut V,`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> {`
`120`	`120`	`match view_path.node {`
`121`	`121`	`ViewPathList(_, ref paths) => {`
`122`	`122`	`for path in paths {`
`123`		`- this.insert(path.node.id(), NodeItem(i));`
	`123`	`+ this.insert(path.node.id, NodeItem(i));`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`_ => ()`
Original file line number	Diff line number	Diff line change
`@@ -2133,16 +2133,7 @@ impl<'a> State<'a> {`
`2133`	`2133`	`self.print_path(path, false, 0)?;`
`2134`	`2134`	`word(&mut self.s, "::{")?;`
`2135`	`2135`	`}`
`2136`		`- self.commasep(Inconsistent, &segments[..], \|s, w\| {`
`2137`		`- match w.node {`
`2138`		`- hir::PathListIdent { name, .. } => {`
`2139`		`- s.print_name(name)`
`2140`		`- }`
`2141`		`- hir::PathListMod { .. } => {`
`2142`		`- word(&mut s.s, "self")`
`2143`		`- }`
`2144`		`- }`
`2145`		`- })?;`
	`2136`	`+ self.commasep(Inconsistent, &segments[..], \|s, w\| s.print_name(w.node.name))?;`
`2146`	`2137`	`word(&mut self.s, "}")`
`2147`	`2138`	`}`
`2148`	`2139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for MarkSymbolVisitor<'a, 'tcx> {`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`fn visit_path_list_item(&mut self, path: &hir::Path, item: &hir::PathListItem) {`
`297`		`- self.lookup_and_handle_definition(item.node.id());`
	`297`	`+ self.lookup_and_handle_definition(item.node.id);`
`298`	`298`	`intravisit::walk_path_list_item(self, path, item);`
`299`	`299`	`}`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for UnusedTraitImportVisitor<'a, 'tcx> {`
`49`	`49`	`}`
`50`	`50`	`hir::ViewPathList(_, ref path_list) => {`
`51`	`51`	`for path_item in path_list {`
`52`		`- self.check_import(path_item.node.id(), path_item.span);`
	`52`	`+ self.check_import(path_item.node.id, path_item.span);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`