Skip to content

Commit 649bcd4

Browse files
committed
Fix fallout in tests.
1 parent bf41c85 commit 649bcd4

25 files changed

+23
-528
lines changed

src/test/compile-fail/auxiliary/issue_12612_1.rs

-13
This file was deleted.

src/test/compile-fail/auxiliary/namespace-mix-old.rs

-83
This file was deleted.

src/test/compile-fail/auxiliary/namespace-mix-new.rs renamed to src/test/compile-fail/auxiliary/namespace-mix.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(item_like_imports)]
12-
1311
pub mod c {
1412
pub struct S {}
1513
pub struct TS();

src/test/compile-fail/glob-cycles.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![feature(rustc_attrs)]
12+
1113
mod foo {
1214
pub use bar::*;
13-
pub use main as f; //~ ERROR has already been imported
15+
pub use main as f;
1416
}
1517

1618
mod bar {
1719
pub use foo::*;
1820
}
1921

2022
pub use foo::*;
21-
pub use baz::*; //~ ERROR has already been imported
23+
pub use baz::*;
2224
mod baz {
2325
pub use super::*;
2426
}
2527

26-
pub fn main() {}
28+
#[rustc_error]
29+
pub fn main() {} //~ ERROR compilation successful

src/test/compile-fail/import-shadow-1.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-2.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-3.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-4.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-5.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-6.rs

-30
This file was deleted.

src/test/compile-fail/import-shadow-7.rs

-30
This file was deleted.

src/test/compile-fail/import.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ mod zed {
2020
}
2121

2222
fn main() {
23-
zed::foo(); //~ ERROR unresolved name
23+
zed::foo(); //~ ERROR `foo` is private
2424
bar();
2525
}

src/test/compile-fail/imports/duplicate.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(item_like_imports)]
12-
1311
mod a {
1412
pub fn foo() {}
1513
}

src/test/compile-fail/imports/reexports.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(item_like_imports)]
12-
1311
mod a {
1412
fn foo() {}
1513
mod foo {}

src/test/compile-fail/imports/unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(pub_restricted, item_like_imports)]
11+
#![feature(pub_restricted)]
1212
#![deny(unused)]
1313

1414
mod foo {

0 commit comments

Comments
 (0)