From f3da59b99f8c6a8899bd1362b8414d591f113e24 Mon Sep 17 00:00:00 2001
From: lpy <pylaurent1314@gmail.com>
Date: Thu, 13 Feb 2014 01:10:36 +0800
Subject: [PATCH] Issue #11983, remove all the globs

---
 src/etc/combine-tests.py                                 | 4 ++--
 src/etc/extract-tests.py                                 | 2 +-
 src/libextra/lib.rs                                      | 2 +-
 src/libgetopts/lib.rs                                    | 2 --
 src/librustc/lib.rs                                      | 2 +-
 src/librustdoc/lib.rs                                    | 2 +-
 src/libstd/lib.rs                                        | 2 +-
 src/libsyntax/lib.rs                                     | 2 +-
 src/test/auxiliary/issue_2316_b.rs                       | 1 -
 src/test/auxiliary/macro_crate_test.rs                   | 2 +-
 src/test/compile-fail/glob-resolve1.rs                   | 2 --
 src/test/compile-fail/import-glob-0.rs                   | 2 --
 src/test/compile-fail/import-glob-circular.rs            | 2 --
 src/test/compile-fail/issue-1697.rs                      | 2 --
 src/test/compile-fail/issue-4366-2.rs                    | 2 --
 src/test/compile-fail/issue-4366.rs                      | 2 --
 src/test/compile-fail/lint-missing-doc.rs                | 1 -
 src/test/compile-fail/lint-stability.rs                  | 1 -
 src/test/compile-fail/lint-unused-import-tricky-globs.rs | 1 -
 src/test/compile-fail/lint-unused-imports.rs             | 1 -
 src/test/compile-fail/name-clash-nullary.rs              | 2 --
 src/test/compile-fail/privacy1.rs                        | 1 -
 src/test/compile-fail/privacy2.rs                        | 1 -
 src/test/compile-fail/privacy3.rs                        | 1 -
 src/test/compile-fail/privacy4.rs                        | 1 -
 src/test/compile-fail/std-uncopyable-atomics.rs          | 2 --
 src/test/run-fail/glob-use-std.rs                        | 2 --
 src/test/run-pass/cci_nested_exe.rs                      | 2 +-
 src/test/run-pass/export-glob-imports-target.rs          | 2 --
 src/test/run-pass/import-glob-0.rs                       | 2 --
 src/test/run-pass/import-in-block.rs                     | 2 --
 src/test/run-pass/intrinsics-integer.rs                  | 2 --
 src/test/run-pass/intrinsics-math.rs                     | 2 +-
 src/test/run-pass/issue-2526-a.rs                        | 1 -
 src/test/run-pass/reexport-star.rs                       | 2 --
 src/test/run-pass/tag-exports.rs                         | 2 --
 36 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index 2c6edaea284f4..4c9a5425cfeec 100755
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -53,7 +53,7 @@ def scrub(b):
 // AUTO-GENERATED FILE: DO NOT EDIT
 #[crate_id=\"run_pass_stage2#0.1\"];
 #[crate_id=\"run_pass_stage2#0.1\"];
-#[feature(globs, macro_rules, struct_variant, managed_boxes)];
+#[feature(macro_rules, struct_variant, managed_boxes)];
 #[allow(warnings)];
 """
 )
@@ -70,7 +70,7 @@ def scrub(b):
 d.write(
 """
 // AUTO-GENERATED FILE: DO NOT EDIT
-#[feature(globs, managed_boxes)];
+#[feature(managed_boxes)];
 extern mod extra;
 extern mod run_pass_stage2;
 use run_pass_stage2::*;
diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py
index 13eadc7988057..3e12c4db3958d 100644
--- a/src/etc/extract-tests.py
+++ b/src/etc/extract-tests.py
@@ -44,7 +44,7 @@
     "#[ allow(unused_mut) ];",
     "#[ allow(attribute_usage) ];",
     "#[ allow(dead_code) ];",
-    "#[ feature(macro_rules, globs, struct_variant, managed_boxes) ];\n",))
+    "#[ feature(macro_rules, struct_variant, managed_boxes) ];\n",))
 
 
 def add_extern_mod(block):
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index 70a21da6816d8..d3505f4170639 100644
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -29,7 +29,7 @@ Rust extras are part of the standard Rust distribution.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, managed_boxes, asm)];
+#[feature(macro_rules, managed_boxes, asm)];
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
index 34e09ac1913db..ebdbd45a1a4c4 100644
--- a/src/libgetopts/lib.rs
+++ b/src/libgetopts/lib.rs
@@ -82,8 +82,6 @@
 #[license = "MIT/ASL2"];
 #[allow(missing_doc)];
 
-#[feature(globs)];
-
 use std::cmp::Eq;
 use std::result::{Err, Ok};
 use std::result;
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 9cd93df6fa3a1..1b6b39ddea8b1 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -27,7 +27,7 @@ This API is completely unstable and subject to change.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, struct_variant, managed_boxes)];
+#[feature(macro_rules, struct_variant, managed_boxes)];
 #[allow(unknown_features)]; // Note: remove it after a snapshot.
 #[feature(quote)];
 
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 3dbf4726ae4cb..380f630fbd4f8 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -13,7 +13,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 
-#[feature(globs, struct_variant, managed_boxes)];
+#[feature(struct_variant, managed_boxes)];
 
 extern mod syntax;
 extern mod rustc;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index e0666ef417927..b3d7f0327b301 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -52,7 +52,7 @@
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args, simd)];
+#[feature(macro_rules, asm, managed_boxes, thread_local, link_args, simd)];
 
 // Don't link to std. We are std.
 #[no_std];
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 613416bed1c14..53b9e78d7b00c 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -26,7 +26,7 @@ This API is completely unstable and subject to change.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, managed_boxes)];
+#[feature(macro_rules, managed_boxes)];
 #[allow(unknown_features)];// Note: remove it after a snapshot.
 #[feature(quote)];
 
diff --git a/src/test/auxiliary/issue_2316_b.rs b/src/test/auxiliary/issue_2316_b.rs
index 92c20e8d9e39b..1c16e347b27be 100644
--- a/src/test/auxiliary/issue_2316_b.rs
+++ b/src/test/auxiliary/issue_2316_b.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #[allow(unused_imports)];
-#[feature(globs)];
 
 extern mod issue_2316_a;
 
diff --git a/src/test/auxiliary/macro_crate_test.rs b/src/test/auxiliary/macro_crate_test.rs
index 2867e0f814306..ebbc84f0d95de 100644
--- a/src/test/auxiliary/macro_crate_test.rs
+++ b/src/test/auxiliary/macro_crate_test.rs
@@ -10,7 +10,7 @@
 
 // force-host
 
-#[feature(globs, macro_registrar, macro_rules, quote)];
+#[feature(macro_registrar, macro_rules, quote)];
 
 extern mod syntax;
 
diff --git a/src/test/compile-fail/glob-resolve1.rs b/src/test/compile-fail/glob-resolve1.rs
index 7363fb6d0b2df..a0004f98ecf27 100644
--- a/src/test/compile-fail/glob-resolve1.rs
+++ b/src/test/compile-fail/glob-resolve1.rs
@@ -10,8 +10,6 @@
 
 // Make sure that globs only bring in public things.
 
-#[feature(globs)];
-
 use bar::*;
 
 mod bar {
diff --git a/src/test/compile-fail/import-glob-0.rs b/src/test/compile-fail/import-glob-0.rs
index 124d4631601d6..805aace081d02 100644
--- a/src/test/compile-fail/import-glob-0.rs
+++ b/src/test/compile-fail/import-glob-0.rs
@@ -10,8 +10,6 @@
 
 // error-pattern: unresolved name
 
-#[feature(globs)];
-
 use module_of_many_things::*;
 
 mod module_of_many_things {
diff --git a/src/test/compile-fail/import-glob-circular.rs b/src/test/compile-fail/import-glob-circular.rs
index ae5a0f04e2c04..49ee1ad55c0ca 100644
--- a/src/test/compile-fail/import-glob-circular.rs
+++ b/src/test/compile-fail/import-glob-circular.rs
@@ -10,8 +10,6 @@
 
 // error-pattern: unresolved
 
-#[feature(globs)];
-
 mod circ1 {
     pub use circ2::f2;
     pub fn f1() { info!("f1"); }
diff --git a/src/test/compile-fail/issue-1697.rs b/src/test/compile-fail/issue-1697.rs
index e49eb1454d8a2..71b319a27d073 100644
--- a/src/test/compile-fail/issue-1697.rs
+++ b/src/test/compile-fail/issue-1697.rs
@@ -10,8 +10,6 @@
 
 // Testing that we don't fail abnormally after hitting the errors
 
-#[feature(globs)];
-
 use unresolved::*; //~ ERROR unresolved import. maybe a missing
 //~^ ERROR failed to resolve import
 
diff --git a/src/test/compile-fail/issue-4366-2.rs b/src/test/compile-fail/issue-4366-2.rs
index 6764b489b6255..fcfe4a5c63656 100644
--- a/src/test/compile-fail/issue-4366-2.rs
+++ b/src/test/compile-fail/issue-4366-2.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 // ensures that 'use foo:*' doesn't import non-public item
 
 use m1::*;
diff --git a/src/test/compile-fail/issue-4366.rs b/src/test/compile-fail/issue-4366.rs
index e9c1092a4a559..289aa21e1cba5 100644
--- a/src/test/compile-fail/issue-4366.rs
+++ b/src/test/compile-fail/issue-4366.rs
@@ -13,8 +13,6 @@
 // ensures that 'use foo:*' doesn't import non-public 'use' statements in the
 // module 'foo'
 
-#[feature(globs)];
-
 use m1::*;
 
 mod foo {
diff --git a/src/test/compile-fail/lint-missing-doc.rs b/src/test/compile-fail/lint-missing-doc.rs
index 9d640647fe08b..039bc9b6f6907 100644
--- a/src/test/compile-fail/lint-missing-doc.rs
+++ b/src/test/compile-fail/lint-missing-doc.rs
@@ -11,7 +11,6 @@
 // When denying at the crate level, be sure to not get random warnings from the
 // injected intrinsics by the compiler.
 #[feature(struct_variant)];
-#[feature(globs)];
 #[deny(missing_doc)];
 #[allow(dead_code)];
 
diff --git a/src/test/compile-fail/lint-stability.rs b/src/test/compile-fail/lint-stability.rs
index 84a1707811699..1eb251720bcc3 100644
--- a/src/test/compile-fail/lint-stability.rs
+++ b/src/test/compile-fail/lint-stability.rs
@@ -11,7 +11,6 @@
 // ignore-fast aux-build
 // aux-build:lint_stability.rs
 
-#[feature(globs)];
 #[deny(unstable)];
 #[deny(deprecated)];
 #[deny(experimental)];
diff --git a/src/test/compile-fail/lint-unused-import-tricky-globs.rs b/src/test/compile-fail/lint-unused-import-tricky-globs.rs
index 9d6140b8fd233..82155be223522 100644
--- a/src/test/compile-fail/lint-unused-import-tricky-globs.rs
+++ b/src/test/compile-fail/lint-unused-import-tricky-globs.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[deny(unused_imports)];
 #[allow(dead_code)];
 
diff --git a/src/test/compile-fail/lint-unused-imports.rs b/src/test/compile-fail/lint-unused-imports.rs
index 8d294af3e3eb9..c43a3d935820d 100644
--- a/src/test/compile-fail/lint-unused-imports.rs
+++ b/src/test/compile-fail/lint-unused-imports.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[deny(unused_imports)];
 #[allow(dead_code)];
 
diff --git a/src/test/compile-fail/name-clash-nullary.rs b/src/test/compile-fail/name-clash-nullary.rs
index 246f0cb9e662d..68f5d921d0239 100644
--- a/src/test/compile-fail/name-clash-nullary.rs
+++ b/src/test/compile-fail/name-clash-nullary.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 // error-pattern:declaration of `None` shadows
 use std::option::*;
 
diff --git a/src/test/compile-fail/privacy1.rs b/src/test/compile-fail/privacy1.rs
index fdc681e1da0c3..02968b19e344e 100644
--- a/src/test/compile-fail/privacy1.rs
+++ b/src/test/compile-fail/privacy1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 mod bar {
diff --git a/src/test/compile-fail/privacy2.rs b/src/test/compile-fail/privacy2.rs
index 98772b0c67b82..e8e21021cccd6 100644
--- a/src/test/compile-fail/privacy2.rs
+++ b/src/test/compile-fail/privacy2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that globs don't leak in regular `use` statements.
diff --git a/src/test/compile-fail/privacy3.rs b/src/test/compile-fail/privacy3.rs
index 3308be4a12e78..523d4cd4b8ddd 100644
--- a/src/test/compile-fail/privacy3.rs
+++ b/src/test/compile-fail/privacy3.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that private items imported through globs remain private
diff --git a/src/test/compile-fail/privacy4.rs b/src/test/compile-fail/privacy4.rs
index 4e33536b2b05f..88a9b2f30580b 100644
--- a/src/test/compile-fail/privacy4.rs
+++ b/src/test/compile-fail/privacy4.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that private items imported through globs remain private
diff --git a/src/test/compile-fail/std-uncopyable-atomics.rs b/src/test/compile-fail/std-uncopyable-atomics.rs
index 57c66974fcd01..dc933a2dd410b 100644
--- a/src/test/compile-fail/std-uncopyable-atomics.rs
+++ b/src/test/compile-fail/std-uncopyable-atomics.rs
@@ -10,8 +10,6 @@
 
 // Issue #8380
 
-#[feature(globs)];
-
 use std::sync::atomics::*;
 use std::ptr;
 
diff --git a/src/test/run-fail/glob-use-std.rs b/src/test/run-fail/glob-use-std.rs
index 77177c8fcb8ee..abb8db45bb27c 100644
--- a/src/test/run-fail/glob-use-std.rs
+++ b/src/test/run-fail/glob-use-std.rs
@@ -11,8 +11,6 @@
 // Issue #7580
 
 // error-pattern:fail works
-#[feature(globs)];
-
 use std::*;
 
 fn main() {
diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/run-pass/cci_nested_exe.rs
index f5f00e4c279d7..f487bfc5dd249 100644
--- a/src/test/run-pass/cci_nested_exe.rs
+++ b/src/test/run-pass/cci_nested_exe.rs
@@ -11,7 +11,7 @@
 // ignore-fast - check-fast doesn't understand aux-build
 // aux-build:cci_nested_lib.rs
 
-#[feature(globs, managed_boxes)];
+#[feature(managed_boxes)];
 
 extern mod cci_nested_lib;
 use cci_nested_lib::*;
diff --git a/src/test/run-pass/export-glob-imports-target.rs b/src/test/run-pass/export-glob-imports-target.rs
index 3d8e760878825..48152204bc3e8 100644
--- a/src/test/run-pass/export-glob-imports-target.rs
+++ b/src/test/run-pass/export-glob-imports-target.rs
@@ -15,8 +15,6 @@
 
 // Modified to not use export since it's going away. --pcw
 
-#[feature(globs)];
-
 mod foo {
     use foo::bar::*;
     pub mod bar {
diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/run-pass/import-glob-0.rs
index 2d9390245272c..08601e95ba097 100644
--- a/src/test/run-pass/import-glob-0.rs
+++ b/src/test/run-pass/import-glob-0.rs
@@ -10,8 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 use module_of_many_things::*;
 use dug::too::greedily::and::too::deep::*;
 
diff --git a/src/test/run-pass/import-in-block.rs b/src/test/run-pass/import-in-block.rs
index 7c0037c1e15d2..87e73f2f56db3 100644
--- a/src/test/run-pass/import-in-block.rs
+++ b/src/test/run-pass/import-in-block.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 pub fn main() {
     use std::mem::replace;
     let mut x = 5;
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs
index 0a805ecc382b7..0c73ab2e19a52 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics-integer.rs
@@ -10,8 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 extern mod extra;
 
 mod rusti {
diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/run-pass/intrinsics-math.rs
index db9edfbefdc7e..e84dfad27de73 100644
--- a/src/test/run-pass/intrinsics-math.rs
+++ b/src/test/run-pass/intrinsics-math.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs, macro_rules)];
+#[feature(macro_rules)];
 
 macro_rules! assert_approx_eq(
     ($a:expr, $b:expr) => ({
diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/run-pass/issue-2526-a.rs
index c58e214113c71..f5b3349a7a981 100644
--- a/src/test/run-pass/issue-2526-a.rs
+++ b/src/test/run-pass/issue-2526-a.rs
@@ -11,7 +11,6 @@
 // ignore-fast
 // aux-build:issue-2526.rs
 
-#[feature(globs)];
 #[allow(unused_imports)];
 
 extern mod issue_2526;
diff --git a/src/test/run-pass/reexport-star.rs b/src/test/run-pass/reexport-star.rs
index f6f7c9921ef02..1dd250d498f89 100644
--- a/src/test/run-pass/reexport-star.rs
+++ b/src/test/run-pass/reexport-star.rs
@@ -10,8 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 // FIXME #3654
 
 mod a {
diff --git a/src/test/run-pass/tag-exports.rs b/src/test/run-pass/tag-exports.rs
index 2fd6be40d11fa..4b0a52a84e78d 100644
--- a/src/test/run-pass/tag-exports.rs
+++ b/src/test/run-pass/tag-exports.rs
@@ -10,8 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(globs)];
-
 use alder::*;
 
 mod alder {