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 --- .../ui/unresolved/unresolved-asterisk-imports.rs | 4 -- .../unresolved/unresolved-asterisk-imports.stderr | 11 ----- src/test/ui/unresolved/unresolved-candidates.rs | 13 ----- .../ui/unresolved/unresolved-candidates.stderr | 26 ---------- .../unresolved/unresolved-extern-mod-suggestion.rs | 5 -- .../unresolved-extern-mod-suggestion.stderr | 13 ----- .../ui/unresolved/unresolved-import-recovery.rs | 17 ------- .../unresolved/unresolved-import-recovery.stderr | 9 ---- src/test/ui/unresolved/unresolved-import.rs | 56 ---------------------- src/test/ui/unresolved/unresolved-import.stderr | 50 ------------------- 10 files changed, 204 deletions(-) delete mode 100644 src/test/ui/unresolved/unresolved-asterisk-imports.rs delete mode 100644 src/test/ui/unresolved/unresolved-asterisk-imports.stderr delete mode 100644 src/test/ui/unresolved/unresolved-candidates.rs delete mode 100644 src/test/ui/unresolved/unresolved-candidates.stderr delete mode 100644 src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs delete mode 100644 src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr delete mode 100644 src/test/ui/unresolved/unresolved-import-recovery.rs delete mode 100644 src/test/ui/unresolved/unresolved-import-recovery.stderr delete mode 100644 src/test/ui/unresolved/unresolved-import.rs delete mode 100644 src/test/ui/unresolved/unresolved-import.stderr (limited to 'src/test/ui/unresolved') diff --git a/src/test/ui/unresolved/unresolved-asterisk-imports.rs b/src/test/ui/unresolved/unresolved-asterisk-imports.rs deleted file mode 100644 index 2d853a66c..000000000 --- a/src/test/ui/unresolved/unresolved-asterisk-imports.rs +++ /dev/null @@ -1,4 +0,0 @@ -use not_existing_crate::*; //~ ERROR unresolved import `not_existing_crate -use std as foo; - -fn main() {} diff --git a/src/test/ui/unresolved/unresolved-asterisk-imports.stderr b/src/test/ui/unresolved/unresolved-asterisk-imports.stderr deleted file mode 100644 index 8df8eab34..000000000 --- a/src/test/ui/unresolved/unresolved-asterisk-imports.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0432]: unresolved import `not_existing_crate` - --> $DIR/unresolved-asterisk-imports.rs:1:5 - | -LL | use not_existing_crate::*; - | ^^^^^^^^^^^^^^^^^^ maybe a missing crate `not_existing_crate`? - | - = help: consider adding `extern crate not_existing_crate` to use the `not_existing_crate` crate - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/unresolved/unresolved-candidates.rs b/src/test/ui/unresolved/unresolved-candidates.rs deleted file mode 100644 index 38b227f60..000000000 --- a/src/test/ui/unresolved/unresolved-candidates.rs +++ /dev/null @@ -1,13 +0,0 @@ -mod a { - pub trait Trait {} -} - -mod b { - use Trait; //~ ERROR unresolved import `Trait` -} - -mod c { - impl Trait for () {} //~ ERROR cannot find trait `Trait` in this scope -} - -fn main() {} diff --git a/src/test/ui/unresolved/unresolved-candidates.stderr b/src/test/ui/unresolved/unresolved-candidates.stderr deleted file mode 100644 index bbd3eec2a..000000000 --- a/src/test/ui/unresolved/unresolved-candidates.stderr +++ /dev/null @@ -1,26 +0,0 @@ -error[E0432]: unresolved import `Trait` - --> $DIR/unresolved-candidates.rs:6:9 - | -LL | use Trait; - | ^^^^^ no `Trait` in the root - | -help: consider importing this trait instead - | -LL | use a::Trait; - | ~~~~~~~~~ - -error[E0405]: cannot find trait `Trait` in this scope - --> $DIR/unresolved-candidates.rs:10:10 - | -LL | impl Trait for () {} - | ^^^^^ not found in this scope - | -help: consider importing this trait - | -LL | use a::Trait; - | - -error: aborting due to 2 previous errors - -Some errors have detailed explanations: E0405, E0432. -For more information about an error, try `rustc --explain E0405`. diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs deleted file mode 100644 index a1bf0f210..000000000 --- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs +++ /dev/null @@ -1,5 +0,0 @@ -extern crate core; -use core; -//~^ ERROR the name `core` is defined multiple times - -fn main() {} diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr deleted file mode 100644 index 28333228a..000000000 --- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error[E0254]: the name `core` is defined multiple times - --> $DIR/unresolved-extern-mod-suggestion.rs:2:5 - | -LL | extern crate core; - | ------------------ previous import of the extern crate `core` here -LL | use core; - | ^^^^ `core` reimported here - | - = note: `core` must be defined only once in the type namespace of this module - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0254`. diff --git a/src/test/ui/unresolved/unresolved-import-recovery.rs b/src/test/ui/unresolved/unresolved-import-recovery.rs deleted file mode 100644 index 0b0653378..000000000 --- a/src/test/ui/unresolved/unresolved-import-recovery.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Check that unresolved imports do not create additional errors and ICEs - -mod m { - pub use unresolved; //~ ERROR unresolved import `unresolved` - - fn f() { - let unresolved = 0; // OK - } -} - -fn main() { - match 0u8 { - m::unresolved => {} // OK - m::unresolved(..) => {} // OK - m::unresolved{..} => {} // OK - } -} diff --git a/src/test/ui/unresolved/unresolved-import-recovery.stderr b/src/test/ui/unresolved/unresolved-import-recovery.stderr deleted file mode 100644 index 5e371b70b..000000000 --- a/src/test/ui/unresolved/unresolved-import-recovery.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `unresolved` - --> $DIR/unresolved-import-recovery.rs:4:13 - | -LL | pub use unresolved; - | ^^^^^^^^^^ no `unresolved` 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/unresolved/unresolved-import.rs b/src/test/ui/unresolved/unresolved-import.rs deleted file mode 100644 index 4125c593c..000000000 --- a/src/test/ui/unresolved/unresolved-import.rs +++ /dev/null @@ -1,56 +0,0 @@ -use foo::bar; //~ ERROR unresolved import `foo` [E0432] - //~^ maybe a missing crate `foo`? - //~| HELP consider adding `extern crate foo` to use the `foo` crate - -use bar::Baz as x; //~ ERROR unresolved import `bar::Baz` [E0432] - //~| no `Baz` in `bar` - //~| HELP a similar name exists in the module - //~| SUGGESTION Bar - -use food::baz; //~ ERROR unresolved import `food::baz` - //~| no `baz` in `food` - //~| HELP a similar name exists in the module - //~| SUGGESTION bag - -use food::{beens as Foo}; //~ ERROR unresolved import `food::beens` [E0432] - //~| no `beens` in `food` - //~| HELP a similar name exists in the module - //~| SUGGESTION beans - -mod bar { - pub struct Bar; -} - -mod food { - pub use self::zug::baz::{self as bag, Foobar as beans}; - - mod zug { - pub mod baz { - pub struct Foobar; - } - } -} - -mod m { - enum MyEnum { - MyVariant - } - - use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432] - //~| HELP a similar path exists - //~| SUGGESTION self::MyEnum -} - -mod items { - enum Enum { - Variant - } - - use Enum::*; //~ ERROR unresolved import `Enum` [E0432] - //~| HELP a similar path exists - //~| SUGGESTION self::Enum - - fn item() {} -} - -fn main() {} diff --git a/src/test/ui/unresolved/unresolved-import.stderr b/src/test/ui/unresolved/unresolved-import.stderr deleted file mode 100644 index 0dd928c8b..000000000 --- a/src/test/ui/unresolved/unresolved-import.stderr +++ /dev/null @@ -1,50 +0,0 @@ -error[E0432]: unresolved import `foo` - --> $DIR/unresolved-import.rs:1:5 - | -LL | use foo::bar; - | ^^^ maybe a missing crate `foo`? - | - = help: consider adding `extern crate foo` to use the `foo` crate - -error[E0432]: unresolved import `bar::Baz` - --> $DIR/unresolved-import.rs:5:5 - | -LL | use bar::Baz as x; - | ^^^^^---^^^^^ - | | | - | | help: a similar name exists in the module: `Bar` - | no `Baz` in `bar` - -error[E0432]: unresolved import `food::baz` - --> $DIR/unresolved-import.rs:10:5 - | -LL | use food::baz; - | ^^^^^^--- - | | | - | | help: a similar name exists in the module: `bag` - | no `baz` in `food` - -error[E0432]: unresolved import `food::beens` - --> $DIR/unresolved-import.rs:15:12 - | -LL | use food::{beens as Foo}; - | -----^^^^^^^ - | | - | no `beens` in `food` - | help: a similar name exists in the module: `beans` - -error[E0432]: unresolved import `MyEnum` - --> $DIR/unresolved-import.rs:39:9 - | -LL | use MyEnum::*; - | ^^^^^^ help: a similar path exists: `self::MyEnum` - -error[E0432]: unresolved import `Enum` - --> $DIR/unresolved-import.rs:49:9 - | -LL | use Enum::*; - | ^^^^ help: a similar path exists: `self::Enum` - -error: aborting due to 6 previous errors - -For more information about this error, try `rustc --explain E0432`. -- cgit v1.2.3