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 --- .../auxiliary/xcrate.rs | 5 ----- .../non-existent-1.rs | 5 ----- .../non-existent-1.stderr | 9 --------- .../non-existent-2.rs | 6 ------ .../non-existent-2.stderr | 9 --------- .../non-existent-3.rs | 5 ----- .../non-existent-3.stderr | 9 --------- .../rfc-2126-extern-absolute-paths/not-allowed.rs | 9 --------- .../not-allowed.stderr | 16 ---------------- .../single-segment.rs | 11 ----------- .../single-segment.stderr | 21 --------------------- 11 files changed, 105 deletions(-) delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs delete mode 100644 src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr (limited to 'src/test/ui/rfc-2126-extern-absolute-paths') diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs deleted file mode 100644 index c4d444764..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs +++ /dev/null @@ -1,5 +0,0 @@ -#[derive(Debug)] -pub struct S; - -#[derive(Debug)] -pub struct Z; diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs deleted file mode 100644 index 9c0e0bef4..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs +++ /dev/null @@ -1,5 +0,0 @@ -// edition:2018 - -use xcrate::S; //~ ERROR unresolved import `xcrate` - -fn main() {} diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr deleted file mode 100644 index 818915721..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `xcrate` - --> $DIR/non-existent-1.rs:3:5 - | -LL | use xcrate::S; - | ^^^^^^ use of undeclared crate or module `xcrate` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs deleted file mode 100644 index def60feb5..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs +++ /dev/null @@ -1,6 +0,0 @@ -// edition:2018 - -fn main() { - let s = ::xcrate::S; - //~^ ERROR failed to resolve: could not find `xcrate` in the list of imported crates -} diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr deleted file mode 100644 index 7df4f06d1..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0433]: failed to resolve: could not find `xcrate` in the list of imported crates - --> $DIR/non-existent-2.rs:4:15 - | -LL | let s = ::xcrate::S; - | ^^^^^^ could not find `xcrate` in the list of imported crates - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0433`. diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs deleted file mode 100644 index 486159c0e..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs +++ /dev/null @@ -1,5 +0,0 @@ -// edition:2018 - -use ycrate; //~ ERROR unresolved import `ycrate` - -fn main() {} diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr deleted file mode 100644 index bd6778cf3..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `ycrate` - --> $DIR/non-existent-3.rs:3:5 - | -LL | use ycrate; - | ^^^^^^ no external crate `ycrate` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs b/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs deleted file mode 100644 index acb4bbebe..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs +++ /dev/null @@ -1,9 +0,0 @@ -// edition:2018 - -// Tests that arbitrary crates (other than `core`, `std` and `meta`) -// aren't allowed without `--extern`, even if they're in the sysroot. -use alloc; //~ ERROR unresolved import `alloc` -use test; // OK, imports the built-in attribute macro `#[test]`, but not the `test` crate. -use proc_macro; // OK, imports the built-in `proc_macro` attribute, but not the `proc_macro` crate. - -fn main() {} diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr deleted file mode 100644 index 761089cd3..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr +++ /dev/null @@ -1,16 +0,0 @@ -error[E0432]: unresolved import `alloc` - --> $DIR/not-allowed.rs:5:5 - | -LL | use alloc; - | ^^^^^ no external crate `alloc` - | -help: consider importing one of these items instead - | -LL | use core::alloc; - | ~~~~~~~~~~~~ -LL | use std::alloc; - | ~~~~~~~~~~~ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs deleted file mode 100644 index 72e50d78b..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs +++ /dev/null @@ -1,11 +0,0 @@ -// aux-build:xcrate.rs -// compile-flags:--extern xcrate -// edition:2018 - -use crate; //~ ERROR crate root imports need to be explicitly named: `use crate as name;` -use *; //~ ERROR cannot glob-import all possible crates - -fn main() { - let s = ::xcrate; //~ ERROR expected value, found crate `xcrate` - //~^ NOTE not a value -} diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr deleted file mode 100644 index 253cc1bc5..000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error: crate root imports need to be explicitly named: `use crate as name;` - --> $DIR/single-segment.rs:5:5 - | -LL | use crate; - | ^^^^^ - -error: cannot glob-import all possible crates - --> $DIR/single-segment.rs:6:5 - | -LL | use *; - | ^ - -error[E0423]: expected value, found crate `xcrate` - --> $DIR/single-segment.rs:9:13 - | -LL | let s = ::xcrate; - | ^^^^^^^^ not a value - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0423`. -- cgit v1.2.3