From a4b7ed7a42c716ab9f05e351f003d589124fd55d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:18:58 +0200 Subject: Adding upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/blind/blind-item-block-item-shadow.rs | 9 --------- src/test/ui/blind/blind-item-block-item-shadow.stderr | 17 ----------------- src/test/ui/blind/blind-item-block-middle.rs | 9 --------- src/test/ui/blind/blind-item-block-middle.stderr | 16 ---------------- src/test/ui/blind/blind-item-item-shadow.rs | 7 ------- src/test/ui/blind/blind-item-item-shadow.stderr | 18 ------------------ 6 files changed, 76 deletions(-) delete mode 100644 src/test/ui/blind/blind-item-block-item-shadow.rs delete mode 100644 src/test/ui/blind/blind-item-block-item-shadow.stderr delete mode 100644 src/test/ui/blind/blind-item-block-middle.rs delete mode 100644 src/test/ui/blind/blind-item-block-middle.stderr delete mode 100644 src/test/ui/blind/blind-item-item-shadow.rs delete mode 100644 src/test/ui/blind/blind-item-item-shadow.stderr (limited to 'src/test/ui/blind') diff --git a/src/test/ui/blind/blind-item-block-item-shadow.rs b/src/test/ui/blind/blind-item-block-item-shadow.rs deleted file mode 100644 index d90ef77e2..000000000 --- a/src/test/ui/blind/blind-item-block-item-shadow.rs +++ /dev/null @@ -1,9 +0,0 @@ -mod foo { pub struct Bar; } - -fn main() { - { - struct Bar; - use foo::Bar; - //~^ ERROR the name `Bar` is defined multiple times - } -} diff --git a/src/test/ui/blind/blind-item-block-item-shadow.stderr b/src/test/ui/blind/blind-item-block-item-shadow.stderr deleted file mode 100644 index 68b3f4c1a..000000000 --- a/src/test/ui/blind/blind-item-block-item-shadow.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0255]: the name `Bar` is defined multiple times - --> $DIR/blind-item-block-item-shadow.rs:6:13 - | -LL | struct Bar; - | ----------- previous definition of the type `Bar` here -LL | use foo::Bar; - | ^^^^^^^^ `Bar` reimported here - | - = note: `Bar` must be defined only once in the type namespace of this block -help: you can use `as` to change the binding name of the import - | -LL | use foo::Bar as OtherBar; - | ~~~~~~~~~~~~~~~~~~~~ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0255`. diff --git a/src/test/ui/blind/blind-item-block-middle.rs b/src/test/ui/blind/blind-item-block-middle.rs deleted file mode 100644 index 6cd3f3bd4..000000000 --- a/src/test/ui/blind/blind-item-block-middle.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![allow(non_camel_case_types)] - -mod foo { pub struct bar; } - -fn main() { - let bar = 5; - //~^ ERROR mismatched types - use foo::bar; -} diff --git a/src/test/ui/blind/blind-item-block-middle.stderr b/src/test/ui/blind/blind-item-block-middle.stderr deleted file mode 100644 index eb64fea94..000000000 --- a/src/test/ui/blind/blind-item-block-middle.stderr +++ /dev/null @@ -1,16 +0,0 @@ -error[E0308]: mismatched types - --> $DIR/blind-item-block-middle.rs:6:9 - | -LL | mod foo { pub struct bar; } - | -------------- unit struct defined here -... -LL | let bar = 5; - | ^^^ - this expression has type `{integer}` - | | - | expected integer, found struct `bar` - | `bar` is interpreted as a unit struct, not a new binding - | help: introduce a new binding instead: `other_bar` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/blind/blind-item-item-shadow.rs b/src/test/ui/blind/blind-item-item-shadow.rs deleted file mode 100644 index 82d07ea70..000000000 --- a/src/test/ui/blind/blind-item-item-shadow.rs +++ /dev/null @@ -1,7 +0,0 @@ -mod foo { pub mod foo { } } - -use foo::foo; -//~^ ERROR the name `foo` is defined multiple times -//~| `foo` reimported here - -fn main() {} diff --git a/src/test/ui/blind/blind-item-item-shadow.stderr b/src/test/ui/blind/blind-item-item-shadow.stderr deleted file mode 100644 index 7f9e80089..000000000 --- a/src/test/ui/blind/blind-item-item-shadow.stderr +++ /dev/null @@ -1,18 +0,0 @@ -error[E0255]: the name `foo` is defined multiple times - --> $DIR/blind-item-item-shadow.rs:3:5 - | -LL | mod foo { pub mod foo { } } - | ------- previous definition of the module `foo` here -LL | -LL | use foo::foo; - | ^^^^^^^^ `foo` reimported here - | - = note: `foo` must be defined only once in the type namespace of this module -help: you can use `as` to change the binding name of the import - | -LL | use foo::foo as other_foo; - | ~~~~~~~~~~~~~~~~~~~~~ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0255`. -- cgit v1.2.3