Remove feature(import_shadowing).

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 31999faa6dfeacd4171be041948f3cbed81c5808..d4273e34a5b2ac749c901d0472fef0b845f6d49a 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1748,10 +1748,6 @@ fn check_for_conflicting_import(&mut self,
                                     import_span: Span,
                                     name: Name,
                                     namespace: Namespace) {
-        if self.session.features.borrow().import_shadowing {
-            return
-        }
-
         debug!("check_for_conflicting_import: {}; target exists: {}",
                token::get_name(name).get(),
                target.is_some());
@@ -1791,10 +1787,6 @@ fn check_for_conflicts_between_imports_and_items(&mut self,
                                                      &ImportResolution,
                                                      import_span: Span,
                                                      name: Name) {
-        if self.session.features.borrow().import_shadowing {
-            return
-        }
-
         // First, check for conflicts between imports and `extern crate`s.
         if module.external_module_children
                  .borrow()
@@ -1888,10 +1880,6 @@ fn check_for_conflicts_between_external_crates(&self,
                                                    module: &Module,
                                                    name: Name,
                                                    span: Span) {
-        if self.session.features.borrow().import_shadowing {
-            return
-        }
-
         if module.external_module_children.borrow().contains_key(&name) {
             self.session
                 .span_err(span,
@@ -1906,10 +1894,6 @@ fn check_for_conflicts_between_external_crates_and_items(&self,
                                                              module: &Module,
                                                              name: Name,
                                                              span: Span) {
-        if self.session.features.borrow().import_shadowing {
-            return
-        }
-
         if module.external_module_children.borrow().contains_key(&name) {
             self.session
                 .span_err(span,

diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 13b7944998ad8dd7c286783a1bbb287ca7b5640f..6ab31c63a1448bcab770ce7d2649efb3bfcd5353 100644 (file)
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -64,7 +64,7 @@
 
     ("rustc_diagnostic_macros", Active),
     ("unboxed_closures", Active),
-    ("import_shadowing", Active),
+    ("import_shadowing", Removed),
     ("advanced_slice_patterns", Active),
     ("tuple_indexing", Accepted),
     ("associated_types", Accepted),
@@ -127,7 +127,6 @@ enum Status {
 pub struct Features {
     pub unboxed_closures: bool,
     pub rustc_diagnostic_macros: bool,
-    pub import_shadowing: bool,
     pub visible_private_types: bool,
     pub quote: bool,
     pub old_orphan_check: bool,
@@ -139,7 +138,6 @@ pub fn new() -> Features {
         Features {
             unboxed_closures: false,
             rustc_diagnostic_macros: false,
-            import_shadowing: false,
             visible_private_types: false,
             quote: false,
             old_orphan_check: false,
@@ -537,7 +535,6 @@ fn check_crate_inner<F>(cm: &CodeMap, span_handler: &SpanHandler, krate: &ast::C
     (Features {
         unboxed_closures: cx.has_feature("unboxed_closures"),
         rustc_diagnostic_macros: cx.has_feature("rustc_diagnostic_macros"),
-        import_shadowing: cx.has_feature("import_shadowing"),
         visible_private_types: cx.has_feature("visible_private_types"),
         quote: cx.has_feature("quote"),
         old_orphan_check: cx.has_feature("old_orphan_check"),