sanity -> validation

Add missing check_path for paths in import prefixes

src/librustc_driver/driver.rs

@@ -38,7 +38,7 @@ use rustc_privacy;
 use rustc_plugin::registry::Registry;
 use rustc_plugin as plugin;
 use rustc::hir::lowering::lower_crate;
-use rustc_passes::{ast_sanity, no_asm, loops, consts, rvalues, static_recursion};
+use rustc_passes::{ast_validation, no_asm, loops, consts, rvalues, static_recursion};
 use rustc_const_eval::check_match;
 use super::Compilation;
 
@@ -167,8 +167,8 @@ pub fn compile_input(sess: &Session,
              || lint::check_ast_crate(sess, &expanded_crate));
 
         time(sess.time_passes(),
-             "AST sanity checking",
-             || ast_sanity::check_crate(sess, &expanded_crate));
+             "AST validation",
+             || ast_validation::check_crate(sess, &expanded_crate));
 
         let (analysis, resolutions, mut hir_forest) = {
             lower_and_resolve(sess, &id, &mut defs, &expanded_crate,

src/librustc_passes/ast_sanity.rs → src/librustc_passes/ast_validation.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Sanity check AST before lowering it to HIR
+// Validate AST before lowering it to HIR
 //
 // This pass is supposed to catch things that fit into AST data structures,
 // but not permitted by the language. It runs after expansion when AST is frozen,
@@ -24,11 +24,11 @@ use syntax::errors;
 use syntax::parse::token::{self, keywords};
 use syntax::visit::{self, Visitor};
 
-struct SanityChecker<'a> {
+struct AstValidator<'a> {
     session: &'a Session,
 }
 
-impl<'a> SanityChecker<'a> {
+impl<'a> AstValidator<'a> {
     fn err_handler(&self) -> &errors::Handler {
         &self.session.parse_sess.span_diagnostic
     }
@@ -55,9 +55,21 @@ impl<'a> SanityChecker<'a> {
             err.emit();
         }
     }
+
+    fn check_path(&self, path: &Path, id: NodeId) {
+        if path.global && path.segments.len() > 0 {
+            let ident = path.segments[0].identifier;
+            if token::Ident(ident).is_path_segment_keyword() {
+                self.session.add_lint(
+                    lint::builtin::SUPER_OR_SELF_IN_GLOBAL_PATH, id, path.span,
+                    format!("global paths cannot start with `{}`", ident)
+                );
+            }
+        }
+    }
 }
 
-impl<'a, 'v> Visitor<'v> for SanityChecker<'a> {
+impl<'a, 'v> Visitor<'v> for AstValidator<'a> {
     fn visit_lifetime(&mut self, lt: &Lifetime) {
         if lt.name.as_str() == "'_" {
             self.session.add_lint(
@@ -85,19 +97,17 @@ impl<'a, 'v> Visitor<'v> for SanityChecker<'a> {
     }
 
     fn visit_path(&mut self, path: &Path, id: NodeId) {
-        if path.global && path.segments.len() > 0 {
-            let ident = path.segments[0].identifier;
-            if token::Ident(ident).is_path_segment_keyword() {
-                self.session.add_lint(
-                    lint::builtin::SUPER_OR_SELF_IN_GLOBAL_PATH, id, path.span,
-                    format!("global paths cannot start with `{}`", ident)
-                );
-            }
-        }
+        self.check_path(path, id);
 
         visit::walk_path(self, path)
     }
 
+    fn visit_path_list_item(&mut self, prefix: &Path, item: &PathListItem) {
+        self.check_path(prefix, item.node.id());
+
+        visit::walk_path_list_item(self, prefix, item)
+    }
+
     fn visit_item(&mut self, item: &Item) {
         match item.node {
             ItemKind::Use(ref view_path) => {
@@ -169,5 +179,5 @@ impl<'a, 'v> Visitor<'v> for SanityChecker<'a> {
 }
 
 pub fn check_crate(session: &Session, krate: &Crate) {
-    visit::walk_crate(&mut SanityChecker { session: session }, krate)
+    visit::walk_crate(&mut AstValidator { session: session }, krate)
 }

src/librustc_passes/lib.rs

@@ -37,7 +37,7 @@ extern crate rustc_const_math;
 
 pub mod diagnostics;
 
-pub mod ast_sanity;
+pub mod ast_validation;
 pub mod consts;
 pub mod loops;
 pub mod no_asm;

src/test/compile-fail/use-super-global-path.rs

@@ -9,8 +9,17 @@
 // except according to those terms.
 
 #![feature(rustc_attrs)]
+#![allow(unused_imports, dead_code)]
+
+struct S;
+struct Z;
 
 mod foo {
+    use ::super::{S, Z}; //~ WARN global paths cannot start with `super`
+    //~^ WARN global paths cannot start with `super`
+    //~^^ WARN this was previously accepted by the compiler but is being phased out
+    //~^^^ WARN this was previously accepted by the compiler but is being phased out
+
     pub fn g() {
         use ::super::main; //~ WARN global paths cannot start with `super`
         //~^ WARN this was previously accepted by the compiler but is being phased out