Skip to content

Fix issue #11983, remove all the globs #12214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/etc/combine-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
"""
)
Expand All @@ -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::*;
Expand Down
2 changes: 1 addition & 1 deletion src/etc/extract-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down
2 changes: 0 additions & 2 deletions src/libgetopts/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@
#[license = "MIT/ASL2"];
#[allow(missing_doc)];

#[feature(globs)];

use std::cmp::Eq;
use std::result::{Err, Ok};
use std::result;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];

Expand Down
1 change: 0 additions & 1 deletion src/test/auxiliary/issue_2316_b.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

#[allow(unused_imports)];
#[feature(globs)];

extern mod issue_2316_a;

Expand Down
2 changes: 1 addition & 1 deletion src/test/auxiliary/macro_crate_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// force-host

#[feature(globs, macro_registrar, macro_rules, quote)];
#[feature(macro_registrar, macro_rules, quote)];

extern mod syntax;

Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/glob-resolve1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// Make sure that globs only bring in public things.

#[feature(globs)];

use bar::*;

mod bar {
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/import-glob-0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// error-pattern: unresolved name

#[feature(globs)];

use module_of_many_things::*;

mod module_of_many_things {
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/import-glob-circular.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// error-pattern: unresolved

#[feature(globs)];

mod circ1 {
pub use circ2::f2;
pub fn f1() { info!("f1"); }
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/issue-1697.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/issue-4366-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/issue-4366.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/lint-missing-doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];

Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/lint-stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// ignore-fast aux-build
// aux-build:lint_stability.rs

#[feature(globs)];
#[deny(unstable)];
#[deny(deprecated)];
#[deny(experimental)];
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/lint-unused-import-tricky-globs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];

Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/lint-unused-imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)];

Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/name-clash-nullary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/privacy1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/privacy2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/privacy3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/test/compile-fail/privacy4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/test/compile-fail/std-uncopyable-atomics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

// Issue #8380

#[feature(globs)];

use std::sync::atomics::*;
use std::ptr;

Expand Down
2 changes: 0 additions & 2 deletions src/test/run-fail/glob-use-std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
// Issue #7580

// error-pattern:fail works
#[feature(globs)];

use std::*;

fn main() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/cci_nested_exe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/export-glob-imports-target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/import-glob-0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/import-in-block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/intrinsics-integer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/intrinsics-math.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/issue-2526-a.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// ignore-fast
// aux-build:issue-2526.rs

#[feature(globs)];
#[allow(unused_imports)];

extern mod issue_2526;
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/reexport-star.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/tag-exports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down