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/extenv/extenv-arg-2-not-string-literal.rs | 1 - .../extenv/extenv-arg-2-not-string-literal.stderr | 8 ---- src/test/ui/extenv/extenv-no-args.rs | 1 - src/test/ui/extenv/extenv-no-args.stderr | 8 ---- src/test/ui/extenv/extenv-not-defined-custom.rs | 1 - .../ui/extenv/extenv-not-defined-custom.stderr | 10 ----- src/test/ui/extenv/extenv-not-defined-default.rs | 4 -- .../ui/extenv/extenv-not-defined-default.stderr | 10 ----- src/test/ui/extenv/extenv-not-string-literal.rs | 1 - .../ui/extenv/extenv-not-string-literal.stderr | 8 ---- src/test/ui/extenv/extenv-too-many-args.rs | 1 - src/test/ui/extenv/extenv-too-many-args.stderr | 8 ---- src/test/ui/extenv/issue-55897.rs | 20 ---------- src/test/ui/extenv/issue-55897.stderr | 45 ---------------------- 14 files changed, 126 deletions(-) delete mode 100644 src/test/ui/extenv/extenv-arg-2-not-string-literal.rs delete mode 100644 src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr delete mode 100644 src/test/ui/extenv/extenv-no-args.rs delete mode 100644 src/test/ui/extenv/extenv-no-args.stderr delete mode 100644 src/test/ui/extenv/extenv-not-defined-custom.rs delete mode 100644 src/test/ui/extenv/extenv-not-defined-custom.stderr delete mode 100644 src/test/ui/extenv/extenv-not-defined-default.rs delete mode 100644 src/test/ui/extenv/extenv-not-defined-default.stderr delete mode 100644 src/test/ui/extenv/extenv-not-string-literal.rs delete mode 100644 src/test/ui/extenv/extenv-not-string-literal.stderr delete mode 100644 src/test/ui/extenv/extenv-too-many-args.rs delete mode 100644 src/test/ui/extenv/extenv-too-many-args.stderr delete mode 100644 src/test/ui/extenv/issue-55897.rs delete mode 100644 src/test/ui/extenv/issue-55897.stderr (limited to 'src/test/ui/extenv') diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs b/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs deleted file mode 100644 index 66dced478..000000000 --- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() { env!("one", 10); } //~ ERROR: expected string literal diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr b/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr deleted file mode 100644 index 258e2b347..000000000 --- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected string literal - --> $DIR/extenv-arg-2-not-string-literal.rs:1:25 - | -LL | fn main() { env!("one", 10); } - | ^^ - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/extenv-no-args.rs b/src/test/ui/extenv/extenv-no-args.rs deleted file mode 100644 index 9f221ed10..000000000 --- a/src/test/ui/extenv/extenv-no-args.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() { env!(); } //~ ERROR: env! takes 1 or 2 arguments diff --git a/src/test/ui/extenv/extenv-no-args.stderr b/src/test/ui/extenv/extenv-no-args.stderr deleted file mode 100644 index 318ed635b..000000000 --- a/src/test/ui/extenv/extenv-no-args.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: env! takes 1 or 2 arguments - --> $DIR/extenv-no-args.rs:1:13 - | -LL | fn main() { env!(); } - | ^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/extenv-not-defined-custom.rs b/src/test/ui/extenv/extenv-not-defined-custom.rs deleted file mode 100644 index 30b72783f..000000000 --- a/src/test/ui/extenv/extenv-not-defined-custom.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } //~ ERROR: my error message diff --git a/src/test/ui/extenv/extenv-not-defined-custom.stderr b/src/test/ui/extenv/extenv-not-defined-custom.stderr deleted file mode 100644 index e7da4e046..000000000 --- a/src/test/ui/extenv/extenv-not-defined-custom.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: my error message - --> $DIR/extenv-not-defined-custom.rs:1:13 - | -LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/extenv-not-defined-default.rs b/src/test/ui/extenv/extenv-not-defined-default.rs deleted file mode 100644 index 30a06a254..000000000 --- a/src/test/ui/extenv/extenv-not-defined-default.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - env!("__HOPEFULLY_NOT_DEFINED__"); - //~^ ERROR: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined -} diff --git a/src/test/ui/extenv/extenv-not-defined-default.stderr b/src/test/ui/extenv/extenv-not-defined-default.stderr deleted file mode 100644 index 884875dca..000000000 --- a/src/test/ui/extenv/extenv-not-defined-default.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined - --> $DIR/extenv-not-defined-default.rs:2:5 - | -LL | env!("__HOPEFULLY_NOT_DEFINED__"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/extenv-not-string-literal.rs b/src/test/ui/extenv/extenv-not-string-literal.rs deleted file mode 100644 index 3eaa0b5da..000000000 --- a/src/test/ui/extenv/extenv-not-string-literal.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() { env!(10, "two"); } //~ ERROR: expected string literal diff --git a/src/test/ui/extenv/extenv-not-string-literal.stderr b/src/test/ui/extenv/extenv-not-string-literal.stderr deleted file mode 100644 index 342a9f709..000000000 --- a/src/test/ui/extenv/extenv-not-string-literal.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected string literal - --> $DIR/extenv-not-string-literal.rs:1:18 - | -LL | fn main() { env!(10, "two"); } - | ^^ - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/extenv-too-many-args.rs b/src/test/ui/extenv/extenv-too-many-args.rs deleted file mode 100644 index 1adbee583..000000000 --- a/src/test/ui/extenv/extenv-too-many-args.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() { env!("one", "two", "three"); } //~ ERROR: env! takes 1 or 2 arguments diff --git a/src/test/ui/extenv/extenv-too-many-args.stderr b/src/test/ui/extenv/extenv-too-many-args.stderr deleted file mode 100644 index 54150a332..000000000 --- a/src/test/ui/extenv/extenv-too-many-args.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: env! takes 1 or 2 arguments - --> $DIR/extenv-too-many-args.rs:1:13 - | -LL | fn main() { env!("one", "two", "three"); } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/extenv/issue-55897.rs b/src/test/ui/extenv/issue-55897.rs deleted file mode 100644 index b7533f413..000000000 --- a/src/test/ui/extenv/issue-55897.rs +++ /dev/null @@ -1,20 +0,0 @@ -use prelude::*; //~ ERROR unresolved import `prelude` - -mod unresolved_env { - use env; //~ ERROR unresolved import `env` - - include!(concat!(env!("NON_EXISTENT"), "/data.rs")); - //~^ ERROR cannot determine resolution for the macro `env` -} - -mod nonexistent_env { - include!(concat!(env!("NON_EXISTENT"), "/data.rs")); - //~^ ERROR environment variable `NON_EXISTENT` not defined -} - -mod erroneous_literal { - include!(concat!("NON_EXISTENT"suffix, "/data.rs")); - //~^ ERROR suffixes on string literals are invalid -} - -fn main() {} diff --git a/src/test/ui/extenv/issue-55897.stderr b/src/test/ui/extenv/issue-55897.stderr deleted file mode 100644 index 63797d4a7..000000000 --- a/src/test/ui/extenv/issue-55897.stderr +++ /dev/null @@ -1,45 +0,0 @@ -error: environment variable `NON_EXISTENT` not defined - --> $DIR/issue-55897.rs:11:22 - | -LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); - | ^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: suffixes on string literals are invalid - --> $DIR/issue-55897.rs:16:22 - | -LL | include!(concat!("NON_EXISTENT"suffix, "/data.rs")); - | ^^^^^^^^^^^^^^^^^^^^ invalid suffix `suffix` - -error[E0432]: unresolved import `prelude` - --> $DIR/issue-55897.rs:1:5 - | -LL | use prelude::*; - | ^^^^^^^ - | | - | unresolved import - | help: a similar path exists: `std::prelude` - -error[E0432]: unresolved import `env` - --> $DIR/issue-55897.rs:4:9 - | -LL | use env; - | ^^^ no `env` in the root - | -help: consider importing this module instead - | -LL | use std::env; - | ~~~~~~~~~ - -error: cannot determine resolution for the macro `env` - --> $DIR/issue-55897.rs:6:22 - | -LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); - | ^^^ - | - = note: import resolution is stuck, try simplifying macro imports - -error: aborting due to 5 previous errors - -For more information about this error, try `rustc --explain E0432`. -- cgit v1.2.3