From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../uniform-paths/ambiguity-macros-nested.rs | 21 ------- .../uniform-paths/ambiguity-macros-nested.stderr | 25 -------- .../ui/rust-2018/uniform-paths/ambiguity-macros.rs | 19 ------ .../uniform-paths/ambiguity-macros.stderr | 25 -------- .../ui/rust-2018/uniform-paths/ambiguity-nested.rs | 16 ----- .../uniform-paths/ambiguity-nested.stderr | 21 ------- src/test/ui/rust-2018/uniform-paths/ambiguity.rs | 12 ---- .../ui/rust-2018/uniform-paths/ambiguity.stderr | 21 ------- .../uniform-paths/auxiliary/cross-crate.rs | 5 -- .../auxiliary/issue-55779-extern-trait.rs | 1 - .../uniform-paths/auxiliary/issue-56596-2.rs | 1 - .../uniform-paths/auxiliary/issue-56596.rs | 1 - .../uniform-paths/auxiliary/issue-87932-a.rs | 3 - .../uniform-paths/block-scoped-shadow-nested.rs | 20 ------- .../block-scoped-shadow-nested.stderr | 24 -------- .../rust-2018/uniform-paths/block-scoped-shadow.rs | 21 ------- .../uniform-paths/block-scoped-shadow.stderr | 60 ------------------- src/test/ui/rust-2018/uniform-paths/cross-crate.rs | 12 ---- .../ui/rust-2018/uniform-paths/cross-crate.stderr | 38 ------------ src/test/ui/rust-2018/uniform-paths/deadlock.rs | 8 --- .../ui/rust-2018/uniform-paths/deadlock.stderr | 24 -------- .../ui/rust-2018/uniform-paths/fn-local-enum.rs | 13 ----- .../ui/rust-2018/uniform-paths/from-decl-macro.rs | 12 ---- src/test/ui/rust-2018/uniform-paths/issue-54253.rs | 17 ------ .../ui/rust-2018/uniform-paths/issue-54253.stderr | 9 --- src/test/ui/rust-2018/uniform-paths/issue-55779.rs | 29 --------- .../ui/rust-2018/uniform-paths/issue-56596-2.rs | 11 ---- src/test/ui/rust-2018/uniform-paths/issue-56596.rs | 12 ---- .../ui/rust-2018/uniform-paths/issue-56596.stderr | 19 ------ src/test/ui/rust-2018/uniform-paths/issue-87932.rs | 15 ----- .../ui/rust-2018/uniform-paths/issue-87932.stderr | 18 ------ src/test/ui/rust-2018/uniform-paths/macro-rules.rs | 43 -------------- .../ui/rust-2018/uniform-paths/macro-rules.stderr | 35 ----------- .../ui/rust-2018/uniform-paths/prelude-fail-2.rs | 21 ------- .../rust-2018/uniform-paths/prelude-fail-2.stderr | 68 ---------------------- .../ui/rust-2018/uniform-paths/prelude-fail.rs | 6 -- .../ui/rust-2018/uniform-paths/prelude-fail.stderr | 9 --- src/test/ui/rust-2018/uniform-paths/prelude.rs | 22 ------- src/test/ui/rust-2018/uniform-paths/redundant.rs | 20 ------- 39 files changed, 757 deletions(-) delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/ambiguity.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/cross-crate.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/cross-crate.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/deadlock.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/deadlock.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-54253.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-54253.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-55779.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-56596.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-56596.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-87932.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/issue-87932.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/macro-rules.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/macro-rules.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/prelude-fail.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr delete mode 100644 src/test/ui/rust-2018/uniform-paths/prelude.rs delete mode 100644 src/test/ui/rust-2018/uniform-paths/redundant.rs (limited to 'src/test/ui/rust-2018/uniform-paths') diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs deleted file mode 100644 index 678b4774d..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs +++ /dev/null @@ -1,21 +0,0 @@ -// edition:2018 - -// This test is similar to `ambiguity-macros.rs`, but nested in a module. - -#![allow(non_camel_case_types)] - -mod foo { - pub use std::io; - //~^ ERROR `std` is ambiguous - - macro_rules! m { - () => { - mod std { - pub struct io; - } - } - } - m!(); -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr deleted file mode 100644 index 7e008d465..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr +++ /dev/null @@ -1,25 +0,0 @@ -error[E0659]: `std` is ambiguous - --> $DIR/ambiguity-macros-nested.rs:8:13 - | -LL | pub use std::io; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources - = note: `std` could refer to a built-in crate - = help: use `::std` to refer to this crate unambiguously -note: `std` could also refer to the module defined here - --> $DIR/ambiguity-macros-nested.rs:13:13 - | -LL | / mod std { -LL | | pub struct io; -LL | | } - | |_____________^ -... -LL | m!(); - | ---- in this macro invocation - = help: use `self::std` to refer to this module unambiguously - = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs deleted file mode 100644 index 56ea726d7..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs +++ /dev/null @@ -1,19 +0,0 @@ -// edition:2018 - -// This test is similar to `ambiguity.rs`, but with macros defining local items. - -#![allow(non_camel_case_types)] - -use std::io; -//~^ ERROR `std` is ambiguous - -macro_rules! m { - () => { - mod std { - pub struct io; - } - } -} -m!(); - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr deleted file mode 100644 index 771d2c10c..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr +++ /dev/null @@ -1,25 +0,0 @@ -error[E0659]: `std` is ambiguous - --> $DIR/ambiguity-macros.rs:7:5 - | -LL | use std::io; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources - = note: `std` could refer to a built-in crate - = help: use `::std` to refer to this crate unambiguously -note: `std` could also refer to the module defined here - --> $DIR/ambiguity-macros.rs:12:9 - | -LL | / mod std { -LL | | pub struct io; -LL | | } - | |_________^ -... -LL | m!(); - | ---- in this macro invocation - = help: use `crate::std` to refer to this module unambiguously - = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs deleted file mode 100644 index 50c8fc822..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs +++ /dev/null @@ -1,16 +0,0 @@ -// edition:2018 - -// This test is similar to `ambiguity.rs`, but nested in a module. - -#![allow(non_camel_case_types)] - -mod foo { - pub use std::io; - //~^ ERROR `std` is ambiguous - - mod std { - pub struct io; - } -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr deleted file mode 100644 index defb16f79..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0659]: `std` is ambiguous - --> $DIR/ambiguity-nested.rs:8:13 - | -LL | pub use std::io; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources - = note: `std` could refer to a built-in crate - = help: use `::std` to refer to this crate unambiguously -note: `std` could also refer to the module defined here - --> $DIR/ambiguity-nested.rs:11:5 - | -LL | / mod std { -LL | | pub struct io; -LL | | } - | |_____^ - = help: use `self::std` to refer to this module unambiguously - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity.rs deleted file mode 100644 index 60f77a1c6..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs +++ /dev/null @@ -1,12 +0,0 @@ -// edition:2018 - -#![allow(non_camel_case_types)] - -use std::io; -//~^ ERROR `std` is ambiguous - -mod std { - pub struct io; -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr deleted file mode 100644 index 2d735c7e3..000000000 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0659]: `std` is ambiguous - --> $DIR/ambiguity.rs:5:5 - | -LL | use std::io; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources - = note: `std` could refer to a built-in crate - = help: use `::std` to refer to this crate unambiguously -note: `std` could also refer to the module defined here - --> $DIR/ambiguity.rs:8:1 - | -LL | / mod std { -LL | | pub struct io; -LL | | } - | |_^ - = help: use `crate::std` to refer to this module unambiguously - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs deleted file mode 100644 index 4aa5d1870..000000000 --- a/src/test/ui/rust-2018/uniform-paths/auxiliary/cross-crate.rs +++ /dev/null @@ -1,5 +0,0 @@ -// edition:2018 - -pub use ignore as built_in_attr; -pub use u8 as built_in_type; -pub use rustfmt as tool_mod; diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs deleted file mode 100644 index 1ce9841c1..000000000 --- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs +++ /dev/null @@ -1 +0,0 @@ -pub trait Trait { fn no_op(&self); } diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs deleted file mode 100644 index db723075f..000000000 --- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596-2.rs +++ /dev/null @@ -1 +0,0 @@ -pub extern crate core; diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs deleted file mode 100644 index bc010a3dd..000000000 --- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-56596.rs +++ /dev/null @@ -1 +0,0 @@ -// Nothing here diff --git a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs b/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs deleted file mode 100644 index 8fd2d77be..000000000 --- a/src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub trait Deserialize { - fn deserialize(); -} diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs deleted file mode 100644 index 3f5897901..000000000 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.rs +++ /dev/null @@ -1,20 +0,0 @@ -// edition:2018 - -mod my { - pub mod sub { - pub fn bar() {} - } -} - -mod sub { - pub fn bar() {} -} - -fn foo() { - use my::sub; - { - use sub::bar; //~ ERROR `sub` is ambiguous - } -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr deleted file mode 100644 index 3d45a8140..000000000 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow-nested.stderr +++ /dev/null @@ -1,24 +0,0 @@ -error[E0659]: `sub` is ambiguous - --> $DIR/block-scoped-shadow-nested.rs:16:13 - | -LL | use sub::bar; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources -note: `sub` could refer to the module imported here - --> $DIR/block-scoped-shadow-nested.rs:14:9 - | -LL | use my::sub; - | ^^^^^^^ -note: `sub` could also refer to the module defined here - --> $DIR/block-scoped-shadow-nested.rs:9:1 - | -LL | / mod sub { -LL | | pub fn bar() {} -LL | | } - | |_^ - = help: use `crate::sub` to refer to this module unambiguously - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs deleted file mode 100644 index 828ee4fe4..000000000 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs +++ /dev/null @@ -1,21 +0,0 @@ -// edition:2018 - -#![allow(non_camel_case_types)] - -enum Foo {} - -struct std; - -fn main() { - enum Foo { A, B } - use Foo::*; - //~^ ERROR `Foo` is ambiguous - - let _ = (A, B); - - fn std() {} - enum std {} - use std as foo; - //~^ ERROR `std` is ambiguous - //~| ERROR `std` is ambiguous -} diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr deleted file mode 100644 index b068312ce..000000000 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr +++ /dev/null @@ -1,60 +0,0 @@ -error[E0659]: `Foo` is ambiguous - --> $DIR/block-scoped-shadow.rs:11:9 - | -LL | use Foo::*; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources -note: `Foo` could refer to the enum defined here - --> $DIR/block-scoped-shadow.rs:10:5 - | -LL | enum Foo { A, B } - | ^^^^^^^^^^^^^^^^^ -note: `Foo` could also refer to the enum defined here - --> $DIR/block-scoped-shadow.rs:5:1 - | -LL | enum Foo {} - | ^^^^^^^^^^^ - = help: use `crate::Foo` to refer to this enum unambiguously - -error[E0659]: `std` is ambiguous - --> $DIR/block-scoped-shadow.rs:18:9 - | -LL | use std as foo; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources -note: `std` could refer to the enum defined here - --> $DIR/block-scoped-shadow.rs:17:5 - | -LL | enum std {} - | ^^^^^^^^^^^ -note: `std` could also refer to the struct defined here - --> $DIR/block-scoped-shadow.rs:7:1 - | -LL | struct std; - | ^^^^^^^^^^^ - = help: use `crate::std` to refer to this struct unambiguously - -error[E0659]: `std` is ambiguous - --> $DIR/block-scoped-shadow.rs:18:9 - | -LL | use std as foo; - | ^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources -note: `std` could refer to the function defined here - --> $DIR/block-scoped-shadow.rs:16:5 - | -LL | fn std() {} - | ^^^^^^^^^^^ -note: `std` could also refer to the unit struct defined here - --> $DIR/block-scoped-shadow.rs:7:1 - | -LL | struct std; - | ^^^^^^^^^^^ - = help: use `crate::std` to refer to this unit struct unambiguously - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/cross-crate.rs b/src/test/ui/rust-2018/uniform-paths/cross-crate.rs deleted file mode 100644 index 0ca7fa37a..000000000 --- a/src/test/ui/rust-2018/uniform-paths/cross-crate.rs +++ /dev/null @@ -1,12 +0,0 @@ -// edition:2018 -// aux-build:cross-crate.rs - -extern crate cross_crate; -use cross_crate::*; - -#[built_in_attr] //~ ERROR cannot use a built-in attribute through an import -#[tool_mod::skip] //~ ERROR cannot use a tool module through an import - //~| ERROR cannot use a tool module through an import -fn main() { - let _: built_in_type; // OK -} diff --git a/src/test/ui/rust-2018/uniform-paths/cross-crate.stderr b/src/test/ui/rust-2018/uniform-paths/cross-crate.stderr deleted file mode 100644 index 45f77a0c9..000000000 --- a/src/test/ui/rust-2018/uniform-paths/cross-crate.stderr +++ /dev/null @@ -1,38 +0,0 @@ -error: cannot use a built-in attribute through an import - --> $DIR/cross-crate.rs:7:3 - | -LL | #[built_in_attr] - | ^^^^^^^^^^^^^ - | -note: the built-in attribute imported here - --> $DIR/cross-crate.rs:5:5 - | -LL | use cross_crate::*; - | ^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/cross-crate.rs:8:3 - | -LL | #[tool_mod::skip] - | ^^^^^^^^ - | -note: the tool module imported here - --> $DIR/cross-crate.rs:5:5 - | -LL | use cross_crate::*; - | ^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/cross-crate.rs:8:3 - | -LL | #[tool_mod::skip] - | ^^^^^^^^ - | -note: the tool module imported here - --> $DIR/cross-crate.rs:5:5 - | -LL | use cross_crate::*; - | ^^^^^^^^^^^^^^ - -error: aborting due to 3 previous errors - diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.rs b/src/test/ui/rust-2018/uniform-paths/deadlock.rs deleted file mode 100644 index 2427bde6d..000000000 --- a/src/test/ui/rust-2018/uniform-paths/deadlock.rs +++ /dev/null @@ -1,8 +0,0 @@ -// edition:2018 -// compile-flags:--extern foo --extern bar - -use bar::foo; //~ ERROR can't find crate for `bar` -use foo::bar; //~ ERROR can't find crate for `foo` -//~^^ ERROR unresolved imports `bar::foo`, `foo::bar` - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr b/src/test/ui/rust-2018/uniform-paths/deadlock.stderr deleted file mode 100644 index 8b9863948..000000000 --- a/src/test/ui/rust-2018/uniform-paths/deadlock.stderr +++ /dev/null @@ -1,24 +0,0 @@ -error[E0463]: can't find crate for `bar` - --> $DIR/deadlock.rs:4:5 - | -LL | use bar::foo; - | ^^^ can't find crate - -error[E0463]: can't find crate for `foo` - --> $DIR/deadlock.rs:5:5 - | -LL | use foo::bar; - | ^^^ can't find crate - -error[E0432]: unresolved imports `bar::foo`, `foo::bar` - --> $DIR/deadlock.rs:4:5 - | -LL | use bar::foo; - | ^^^^^^^^ -LL | use foo::bar; - | ^^^^^^^^ - -error: aborting due to 3 previous errors - -Some errors have detailed explanations: E0432, E0463. -For more information about an error, try `rustc --explain E0432`. diff --git a/src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs b/src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs deleted file mode 100644 index c6525869b..000000000 --- a/src/test/ui/rust-2018/uniform-paths/fn-local-enum.rs +++ /dev/null @@ -1,13 +0,0 @@ -// build-pass (FIXME(62277): could be check-pass?) -// edition:2018 - -fn main() { - enum E { A, B, C } - - use E::*; - match A { - A => {} - B => {} - C => {} - } -} diff --git a/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs b/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs deleted file mode 100644 index 9af520a07..000000000 --- a/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs +++ /dev/null @@ -1,12 +0,0 @@ -// build-pass (FIXME(62277): could be check-pass?) -// edition:2018 - -#![feature(decl_macro)] - -macro check() { - ::std::vec::Vec::::new() -} - -fn main() { - check!(); -} diff --git a/src/test/ui/rust-2018/uniform-paths/issue-54253.rs b/src/test/ui/rust-2018/uniform-paths/issue-54253.rs deleted file mode 100644 index 7db469945..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-54253.rs +++ /dev/null @@ -1,17 +0,0 @@ -// edition:2018 - -// Dummy import that previously introduced uniform path canaries. -use std; - -// fn version() -> &'static str {""} - -mod foo { - // Error wasn't reported, despite `version` being commented out above. - use crate::version; //~ ERROR unresolved import `crate::version` - - fn bar() { - version(); - } -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/issue-54253.stderr b/src/test/ui/rust-2018/uniform-paths/issue-54253.stderr deleted file mode 100644 index adde63590..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-54253.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `crate::version` - --> $DIR/issue-54253.rs:10:9 - | -LL | use crate::version; - | ^^^^^^^^^^^^^^ no `version` in the root - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/rust-2018/uniform-paths/issue-55779.rs b/src/test/ui/rust-2018/uniform-paths/issue-55779.rs deleted file mode 100644 index 0af17a89b..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-55779.rs +++ /dev/null @@ -1,29 +0,0 @@ -// run-pass -// edition:2018 -// aux-crate:issue_55779_extern_trait=issue-55779-extern-trait.rs - -use issue_55779_extern_trait::Trait; - -struct Local; -struct Helper; - -impl Trait for Local { - fn no_op(&self) - { - // (Unused) extern crate declaration necessary to reproduce bug - extern crate issue_55779_extern_trait; - - // This one works - // impl Trait for Helper { fn no_op(&self) { } } - - // This one infinite-loops - const _IMPL_SERIALIZE_FOR_HELPER: () = { - // (extern crate can also appear here to reproduce bug, - // as in originating example from serde) - impl Trait for Helper { fn no_op(&self) { } } - }; - - } -} - -fn main() { } diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs b/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs deleted file mode 100644 index 9ea7e496d..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-56596-2.rs +++ /dev/null @@ -1,11 +0,0 @@ -// check-pass -// edition:2018 -// compile-flags: --extern issue_56596_2 -// aux-build:issue-56596-2.rs - -mod m { - use core::any; - pub use issue_56596_2::*; -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs b/src/test/ui/rust-2018/uniform-paths/issue-56596.rs deleted file mode 100644 index ec5bb656a..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs +++ /dev/null @@ -1,12 +0,0 @@ -// edition:2018 -// compile-flags: --extern issue_56596 -// aux-build:issue-56596.rs - -mod m { - pub mod issue_56596 {} -} - -use m::*; -use issue_56596; //~ ERROR `issue_56596` is ambiguous - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr b/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr deleted file mode 100644 index 8b8ab26dc..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr +++ /dev/null @@ -1,19 +0,0 @@ -error[E0659]: `issue_56596` is ambiguous - --> $DIR/issue-56596.rs:10:5 - | -LL | use issue_56596; - | ^^^^^^^^^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources - = note: `issue_56596` could refer to a crate passed with `--extern` - = help: use `::issue_56596` to refer to this crate unambiguously -note: `issue_56596` could also refer to the module imported here - --> $DIR/issue-56596.rs:9:5 - | -LL | use m::*; - | ^^^^ - = help: use `crate::issue_56596` to refer to this module unambiguously - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/rust-2018/uniform-paths/issue-87932.rs b/src/test/ui/rust-2018/uniform-paths/issue-87932.rs deleted file mode 100644 index 70a641d8a..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-87932.rs +++ /dev/null @@ -1,15 +0,0 @@ -// edition:2018 -// aux-crate:issue_87932_a=issue-87932-a.rs - -pub struct A {} - -impl issue_87932_a::Deserialize for A { - fn deserialize() { - extern crate issue_87932_a as _a; - } -} - -fn main() { - A::deserialize(); - //~^ ERROR no function or associated item named `deserialize` found for struct `A` -} diff --git a/src/test/ui/rust-2018/uniform-paths/issue-87932.stderr b/src/test/ui/rust-2018/uniform-paths/issue-87932.stderr deleted file mode 100644 index b52720ae3..000000000 --- a/src/test/ui/rust-2018/uniform-paths/issue-87932.stderr +++ /dev/null @@ -1,18 +0,0 @@ -error[E0599]: no function or associated item named `deserialize` found for struct `A` in the current scope - --> $DIR/issue-87932.rs:13:8 - | -LL | pub struct A {} - | ------------ function or associated item `deserialize` not found for this struct -... -LL | A::deserialize(); - | ^^^^^^^^^^^ function or associated item not found in `A` - | - = help: items from traits can only be used if the trait is in scope -help: the following trait is implemented but not in scope; perhaps add a `use` for it: - | -LL | use ::deserialize::_a::Deserialize; - | - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0599`. diff --git a/src/test/ui/rust-2018/uniform-paths/macro-rules.rs b/src/test/ui/rust-2018/uniform-paths/macro-rules.rs deleted file mode 100644 index 2d9a6a9a9..000000000 --- a/src/test/ui/rust-2018/uniform-paths/macro-rules.rs +++ /dev/null @@ -1,43 +0,0 @@ -// edition:2018 - -#![feature(decl_macro)] - -mod m1 { - // Non-exported legacy macros are treated as `pub(crate)`. - macro_rules! legacy_macro { () => () } - - use legacy_macro as _; // OK - pub(crate) use legacy_macro as _; // OK - pub use legacy_macro as _; //~ ERROR `legacy_macro` is only public within the crate, and cannot be re-exported outside -} - -mod m2 { - macro_rules! legacy_macro { () => () } - - #[allow(non_camel_case_types)] - type legacy_macro = u8; - - // Legacy macro imports don't prevent names from other namespaces from being imported. - use legacy_macro as _; // OK -} - -mod m3 { - macro legacy_macro() {} - - fn f() { - macro_rules! legacy_macro { () => () } - - // Legacy macro imports create ambiguities with other names in the same namespace. - use legacy_macro as _; //~ ERROR `legacy_macro` is ambiguous - } -} - -mod exported { - // Exported legacy macros are treated as `pub`. - #[macro_export] - macro_rules! legacy_macro { () => () } - - pub use legacy_macro as _; // OK -} - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/macro-rules.stderr b/src/test/ui/rust-2018/uniform-paths/macro-rules.stderr deleted file mode 100644 index 9f8c928c3..000000000 --- a/src/test/ui/rust-2018/uniform-paths/macro-rules.stderr +++ /dev/null @@ -1,35 +0,0 @@ -error[E0364]: `legacy_macro` is only public within the crate, and cannot be re-exported outside - --> $DIR/macro-rules.rs:11:13 - | -LL | pub use legacy_macro as _; - | ^^^^^^^^^^^^^^^^^ - | -help: consider adding a `#[macro_export]` to the macro in the imported module - --> $DIR/macro-rules.rs:7:5 - | -LL | macro_rules! legacy_macro { () => () } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error[E0659]: `legacy_macro` is ambiguous - --> $DIR/macro-rules.rs:31:13 - | -LL | use legacy_macro as _; - | ^^^^^^^^^^^^ ambiguous name - | - = note: ambiguous because of multiple potential import sources -note: `legacy_macro` could refer to the macro defined here - --> $DIR/macro-rules.rs:28:9 - | -LL | macro_rules! legacy_macro { () => () } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: `legacy_macro` could also refer to the macro defined here - --> $DIR/macro-rules.rs:25:5 - | -LL | macro legacy_macro() {} - | ^^^^^^^^^^^^^^^^^^^^^^^ - = help: use `self::legacy_macro` to refer to this macro unambiguously - -error: aborting due to 2 previous errors - -Some errors have detailed explanations: E0364, E0659. -For more information about an error, try `rustc --explain E0364`. diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs b/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs deleted file mode 100644 index 44da71de0..000000000 --- a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.rs +++ /dev/null @@ -1,21 +0,0 @@ -// edition:2018 - -// Built-in attribute -use inline as imported_inline; -mod builtin { - pub use inline as imported_inline; -} - -// Tool module -use rustfmt as imported_rustfmt; -mod tool_mod { - pub use rustfmt as imported_rustfmt; -} - -#[imported_inline] //~ ERROR cannot use a built-in attribute through an import -#[builtin::imported_inline] //~ ERROR cannot use a built-in attribute through an import -#[imported_rustfmt::skip] //~ ERROR cannot use a tool module through an import - //~| ERROR cannot use a tool module through an import -#[tool_mod::imported_rustfmt::skip] //~ ERROR cannot use a tool module through an import - //~| ERROR cannot use a tool module through an import -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr b/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr deleted file mode 100644 index 908bb4985..000000000 --- a/src/test/ui/rust-2018/uniform-paths/prelude-fail-2.stderr +++ /dev/null @@ -1,68 +0,0 @@ -error: cannot use a built-in attribute through an import - --> $DIR/prelude-fail-2.rs:15:3 - | -LL | #[imported_inline] - | ^^^^^^^^^^^^^^^ - | -note: the built-in attribute imported here - --> $DIR/prelude-fail-2.rs:4:5 - | -LL | use inline as imported_inline; - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: cannot use a built-in attribute through an import - --> $DIR/prelude-fail-2.rs:16:3 - | -LL | #[builtin::imported_inline] - | ^^^^^^^^^^^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/prelude-fail-2.rs:17:3 - | -LL | #[imported_rustfmt::skip] - | ^^^^^^^^^^^^^^^^ - | -note: the tool module imported here - --> $DIR/prelude-fail-2.rs:10:5 - | -LL | use rustfmt as imported_rustfmt; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/prelude-fail-2.rs:19:13 - | -LL | #[tool_mod::imported_rustfmt::skip] - | ^^^^^^^^^^^^^^^^ - | -note: the tool module imported here - --> $DIR/prelude-fail-2.rs:12:13 - | -LL | pub use rustfmt as imported_rustfmt; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/prelude-fail-2.rs:17:3 - | -LL | #[imported_rustfmt::skip] - | ^^^^^^^^^^^^^^^^ - | -note: the tool module imported here - --> $DIR/prelude-fail-2.rs:10:5 - | -LL | use rustfmt as imported_rustfmt; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: cannot use a tool module through an import - --> $DIR/prelude-fail-2.rs:19:13 - | -LL | #[tool_mod::imported_rustfmt::skip] - | ^^^^^^^^^^^^^^^^ - | -note: the tool module imported here - --> $DIR/prelude-fail-2.rs:12:13 - | -LL | pub use rustfmt as imported_rustfmt; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to 6 previous errors - diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail.rs b/src/test/ui/rust-2018/uniform-paths/prelude-fail.rs deleted file mode 100644 index 48c33d720..000000000 --- a/src/test/ui/rust-2018/uniform-paths/prelude-fail.rs +++ /dev/null @@ -1,6 +0,0 @@ -// edition:2018 - -// Tool attribute -use rustfmt::skip as imported_rustfmt_skip; //~ ERROR unresolved import `rustfmt` - -fn main() {} diff --git a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr b/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr deleted file mode 100644 index 97d4c7367..000000000 --- a/src/test/ui/rust-2018/uniform-paths/prelude-fail.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `rustfmt` - --> $DIR/prelude-fail.rs:4:5 - | -LL | use rustfmt::skip as imported_rustfmt_skip; - | ^^^^^^^ `rustfmt` is a tool module, not a module - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/rust-2018/uniform-paths/prelude.rs b/src/test/ui/rust-2018/uniform-paths/prelude.rs deleted file mode 100644 index 65763614c..000000000 --- a/src/test/ui/rust-2018/uniform-paths/prelude.rs +++ /dev/null @@ -1,22 +0,0 @@ -// build-pass (FIXME(62277): could be check-pass?) -// edition:2018 - -// Macro imported with `#[macro_use] extern crate` -use vec as imported_vec; - -// Standard library prelude -use Vec as ImportedVec; - -// Built-in type -use u8 as imported_u8; - -// Built-in macro -use env as env_imported; - -type A = imported_u8; - -fn main() { - imported_vec![0]; - ImportedVec::::new(); - env_imported!("PATH"); -} diff --git a/src/test/ui/rust-2018/uniform-paths/redundant.rs b/src/test/ui/rust-2018/uniform-paths/redundant.rs deleted file mode 100644 index fd7fc7fbd..000000000 --- a/src/test/ui/rust-2018/uniform-paths/redundant.rs +++ /dev/null @@ -1,20 +0,0 @@ -// run-pass -// edition:2018 - -use std; -use std::io; - -mod foo { - pub use std as my_std; -} - -mod bar { - pub use std::{self}; -} - -fn main() { - let _ = io::stdout(); - let _ = self::std::io::stdout(); - let _ = foo::my_std::io::stdout(); - let _ = bar::std::io::stdout(); -} -- cgit v1.2.3