From 36514015ffc58ede3995e96dc0b057fc8a32de0b Mon Sep 17 00:00:00 2001 From: beetrees Date: Sun, 17 Mar 2024 19:04:42 +0000 Subject: [PATCH] Move `option_env!` and `env!` tests to the `env-macro` directory --- src/tools/tidy/src/issues.txt | 2 -- src/tools/tidy/src/ui_tests.rs | 2 +- .../env-arg-2-not-string-literal.rs} | 0 .../env-arg-2-not-string-literal.stderr} | 2 +- .../env-env-overload.rs} | 0 tests/ui/{extenv/extenv-env.rs => env-macro/env-env.rs} | 0 .../env-escaped-var.rs} | 0 .../env-escaped-var.stderr} | 2 +- .../extenv-no-args.rs => env-macro/env-no-args.rs} | 0 .../env-no-args.stderr} | 2 +- .../env-not-defined-custom.rs} | 0 .../env-not-defined-custom.stderr} | 2 +- .../env-not-defined-default.rs} | 0 .../env-not-defined-default.stderr} | 2 +- .../extenv-not-env.rs => env-macro/env-not-env.rs} | 0 .../env-not-string-literal.rs} | 0 .../env-not-string-literal.stderr} | 2 +- .../env-too-many-args.rs} | 0 .../env-too-many-args.stderr} | 2 +- .../error-recovery-issue-55897.rs} | 0 .../error-recovery-issue-55897.stderr} | 8 ++++---- .../name-whitespace-issue-110547.rs} | 0 .../name-whitespace-issue-110547.stderr} | 6 +++--- .../option_env-no-args.rs} | 0 .../option_env-no-args.stderr} | 2 +- .../option_env-not-defined.rs} | 0 .../option_env-not-string-literal.rs} | 0 .../option_env-not-string-literal.stderr} | 2 +- .../option_env-too-many-args.rs} | 0 .../option_env-too-many-args.stderr} | 2 +- 30 files changed, 18 insertions(+), 20 deletions(-) rename tests/ui/{extenv/extenv-arg-2-not-string-literal.rs => env-macro/env-arg-2-not-string-literal.rs} (100%) rename tests/ui/{extenv/extenv-arg-2-not-string-literal.stderr => env-macro/env-arg-2-not-string-literal.stderr} (74%) rename tests/ui/{extenv/extenv-env-overload.rs => env-macro/env-env-overload.rs} (100%) rename tests/ui/{extenv/extenv-env.rs => env-macro/env-env.rs} (100%) rename tests/ui/{extenv/extenv-escaped-var.rs => env-macro/env-escaped-var.rs} (100%) rename tests/ui/{extenv/extenv-escaped-var.stderr => env-macro/env-escaped-var.stderr} (90%) rename tests/ui/{extenv/extenv-no-args.rs => env-macro/env-no-args.rs} (100%) rename tests/ui/{extenv/extenv-no-args.stderr => env-macro/env-no-args.stderr} (80%) rename tests/ui/{extenv/extenv-not-defined-custom.rs => env-macro/env-not-defined-custom.rs} (100%) rename tests/ui/{extenv/extenv-not-defined-custom.stderr => env-macro/env-not-defined-custom.stderr} (88%) rename tests/ui/{extenv/extenv-not-defined-default.rs => env-macro/env-not-defined-default.rs} (100%) rename tests/ui/{extenv/extenv-not-defined-default.stderr => env-macro/env-not-defined-default.stderr} (91%) rename tests/ui/{extenv/extenv-not-env.rs => env-macro/env-not-env.rs} (100%) rename tests/ui/{extenv/extenv-not-string-literal.rs => env-macro/env-not-string-literal.rs} (100%) rename tests/ui/{extenv/extenv-not-string-literal.stderr => env-macro/env-not-string-literal.stderr} (75%) rename tests/ui/{extenv/extenv-too-many-args.rs => env-macro/env-too-many-args.rs} (100%) rename tests/ui/{extenv/extenv-too-many-args.stderr => env-macro/env-too-many-args.stderr} (81%) rename tests/ui/{extenv/issue-55897.rs => env-macro/error-recovery-issue-55897.rs} (100%) rename tests/ui/{extenv/issue-55897.stderr => env-macro/error-recovery-issue-55897.stderr} (85%) rename tests/ui/{extenv/issue-110547.rs => env-macro/name-whitespace-issue-110547.rs} (100%) rename tests/ui/{extenv/issue-110547.stderr => env-macro/name-whitespace-issue-110547.stderr} (87%) rename tests/ui/{extoption_env-no-args.rs => env-macro/option_env-no-args.rs} (100%) rename tests/ui/{extoption_env-no-args.stderr => env-macro/option_env-no-args.stderr} (78%) rename tests/ui/{extoption_env-not-defined.rs => env-macro/option_env-not-defined.rs} (100%) rename tests/ui/{extoption_env-not-string-literal.rs => env-macro/option_env-not-string-literal.rs} (100%) rename tests/ui/{extoption_env-not-string-literal.stderr => env-macro/option_env-not-string-literal.stderr} (75%) rename tests/ui/{extoption_env-too-many-args.rs => env-macro/option_env-too-many-args.rs} (100%) rename tests/ui/{extoption_env-too-many-args.stderr => env-macro/option_env-too-many-args.stderr} (78%) diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index 0ef962c2df870..03e4ecca9d6fd 100644 --- a/src/tools/tidy/src/issues.txt +++ b/src/tools/tidy/src/issues.txt @@ -968,8 +968,6 @@ "ui/errors/issue-89280-emitter-overflow-splice-lines.rs", "ui/errors/issue-99572-impl-trait-on-pointer.rs", "ui/expr/if/issue-4201.rs", -"ui/extenv/issue-110547.rs", -"ui/extenv/issue-55897.rs", "ui/extern/auxiliary/issue-80074-macro-2.rs", "ui/extern/auxiliary/issue-80074-macro.rs", "ui/extern/issue-10025.rs", diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index c946554b98ff6..22927cffd1b9b 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900; // FIXME: The following limits should be reduced eventually. const ISSUES_ENTRY_LIMIT: usize = 1750; -const ROOT_ENTRY_LIMIT: usize = 866; +const ROOT_ENTRY_LIMIT: usize = 859; const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[ "rs", // test source files diff --git a/tests/ui/extenv/extenv-arg-2-not-string-literal.rs b/tests/ui/env-macro/env-arg-2-not-string-literal.rs similarity index 100% rename from tests/ui/extenv/extenv-arg-2-not-string-literal.rs rename to tests/ui/env-macro/env-arg-2-not-string-literal.rs diff --git a/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr b/tests/ui/env-macro/env-arg-2-not-string-literal.stderr similarity index 74% rename from tests/ui/extenv/extenv-arg-2-not-string-literal.stderr rename to tests/ui/env-macro/env-arg-2-not-string-literal.stderr index 9db1c0be74686..843ce4823ea77 100644 --- a/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr +++ b/tests/ui/env-macro/env-arg-2-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-arg-2-not-string-literal.rs:1:25 + --> $DIR/env-arg-2-not-string-literal.rs:1:25 | LL | fn main() { env!("one", 10); } | ^^ diff --git a/tests/ui/extenv/extenv-env-overload.rs b/tests/ui/env-macro/env-env-overload.rs similarity index 100% rename from tests/ui/extenv/extenv-env-overload.rs rename to tests/ui/env-macro/env-env-overload.rs diff --git a/tests/ui/extenv/extenv-env.rs b/tests/ui/env-macro/env-env.rs similarity index 100% rename from tests/ui/extenv/extenv-env.rs rename to tests/ui/env-macro/env-env.rs diff --git a/tests/ui/extenv/extenv-escaped-var.rs b/tests/ui/env-macro/env-escaped-var.rs similarity index 100% rename from tests/ui/extenv/extenv-escaped-var.rs rename to tests/ui/env-macro/env-escaped-var.rs diff --git a/tests/ui/extenv/extenv-escaped-var.stderr b/tests/ui/env-macro/env-escaped-var.stderr similarity index 90% rename from tests/ui/extenv/extenv-escaped-var.stderr rename to tests/ui/env-macro/env-escaped-var.stderr index ef5e654d0543a..53a2ead67429d 100644 --- a/tests/ui/extenv/extenv-escaped-var.stderr +++ b/tests/ui/env-macro/env-escaped-var.stderr @@ -1,5 +1,5 @@ error: environment variable `\t` not defined at compile time - --> $DIR/extenv-escaped-var.rs:2:5 + --> $DIR/env-escaped-var.rs:2:5 | LL | env!("\t"); | ^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-no-args.rs b/tests/ui/env-macro/env-no-args.rs similarity index 100% rename from tests/ui/extenv/extenv-no-args.rs rename to tests/ui/env-macro/env-no-args.rs diff --git a/tests/ui/extenv/extenv-no-args.stderr b/tests/ui/env-macro/env-no-args.stderr similarity index 80% rename from tests/ui/extenv/extenv-no-args.stderr rename to tests/ui/env-macro/env-no-args.stderr index 36d485676c21b..3a94b36cd0f04 100644 --- a/tests/ui/extenv/extenv-no-args.stderr +++ b/tests/ui/env-macro/env-no-args.stderr @@ -1,5 +1,5 @@ error: `env!()` takes 1 or 2 arguments - --> $DIR/extenv-no-args.rs:1:13 + --> $DIR/env-no-args.rs:1:13 | LL | fn main() { env!(); } | ^^^^^^ diff --git a/tests/ui/extenv/extenv-not-defined-custom.rs b/tests/ui/env-macro/env-not-defined-custom.rs similarity index 100% rename from tests/ui/extenv/extenv-not-defined-custom.rs rename to tests/ui/env-macro/env-not-defined-custom.rs diff --git a/tests/ui/extenv/extenv-not-defined-custom.stderr b/tests/ui/env-macro/env-not-defined-custom.stderr similarity index 88% rename from tests/ui/extenv/extenv-not-defined-custom.stderr rename to tests/ui/env-macro/env-not-defined-custom.stderr index 9b6e32bc95f24..70c41bcc52eb3 100644 --- a/tests/ui/extenv/extenv-not-defined-custom.stderr +++ b/tests/ui/env-macro/env-not-defined-custom.stderr @@ -1,5 +1,5 @@ error: my error message - --> $DIR/extenv-not-defined-custom.rs:1:13 + --> $DIR/env-not-defined-custom.rs:1:13 | LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-not-defined-default.rs b/tests/ui/env-macro/env-not-defined-default.rs similarity index 100% rename from tests/ui/extenv/extenv-not-defined-default.rs rename to tests/ui/env-macro/env-not-defined-default.rs diff --git a/tests/ui/extenv/extenv-not-defined-default.stderr b/tests/ui/env-macro/env-not-defined-default.stderr similarity index 91% rename from tests/ui/extenv/extenv-not-defined-default.stderr rename to tests/ui/env-macro/env-not-defined-default.stderr index 5198818f89cc6..efd7fdb4e5371 100644 --- a/tests/ui/extenv/extenv-not-defined-default.stderr +++ b/tests/ui/env-macro/env-not-defined-default.stderr @@ -1,5 +1,5 @@ error: environment variable `CARGO__HOPEFULLY_NOT_DEFINED__` not defined at compile time - --> $DIR/extenv-not-defined-default.rs:2:5 + --> $DIR/env-not-defined-default.rs:2:5 | LL | env!("CARGO__HOPEFULLY_NOT_DEFINED__"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-not-env.rs b/tests/ui/env-macro/env-not-env.rs similarity index 100% rename from tests/ui/extenv/extenv-not-env.rs rename to tests/ui/env-macro/env-not-env.rs diff --git a/tests/ui/extenv/extenv-not-string-literal.rs b/tests/ui/env-macro/env-not-string-literal.rs similarity index 100% rename from tests/ui/extenv/extenv-not-string-literal.rs rename to tests/ui/env-macro/env-not-string-literal.rs diff --git a/tests/ui/extenv/extenv-not-string-literal.stderr b/tests/ui/env-macro/env-not-string-literal.stderr similarity index 75% rename from tests/ui/extenv/extenv-not-string-literal.stderr rename to tests/ui/env-macro/env-not-string-literal.stderr index 85ed442e2fead..0985459eff924 100644 --- a/tests/ui/extenv/extenv-not-string-literal.stderr +++ b/tests/ui/env-macro/env-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-not-string-literal.rs:1:18 + --> $DIR/env-not-string-literal.rs:1:18 | LL | fn main() { env!(10, "two"); } | ^^ diff --git a/tests/ui/extenv/extenv-too-many-args.rs b/tests/ui/env-macro/env-too-many-args.rs similarity index 100% rename from tests/ui/extenv/extenv-too-many-args.rs rename to tests/ui/env-macro/env-too-many-args.rs diff --git a/tests/ui/extenv/extenv-too-many-args.stderr b/tests/ui/env-macro/env-too-many-args.stderr similarity index 81% rename from tests/ui/extenv/extenv-too-many-args.stderr rename to tests/ui/env-macro/env-too-many-args.stderr index c0fd5d57251f1..f156026846aaa 100644 --- a/tests/ui/extenv/extenv-too-many-args.stderr +++ b/tests/ui/env-macro/env-too-many-args.stderr @@ -1,5 +1,5 @@ error: `env!()` takes 1 or 2 arguments - --> $DIR/extenv-too-many-args.rs:1:13 + --> $DIR/env-too-many-args.rs:1:13 | LL | fn main() { env!("one", "two", "three"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/issue-55897.rs b/tests/ui/env-macro/error-recovery-issue-55897.rs similarity index 100% rename from tests/ui/extenv/issue-55897.rs rename to tests/ui/env-macro/error-recovery-issue-55897.rs diff --git a/tests/ui/extenv/issue-55897.stderr b/tests/ui/env-macro/error-recovery-issue-55897.stderr similarity index 85% rename from tests/ui/extenv/issue-55897.stderr rename to tests/ui/env-macro/error-recovery-issue-55897.stderr index 2e8c05cca867f..5a20bf8b16869 100644 --- a/tests/ui/extenv/issue-55897.stderr +++ b/tests/ui/env-macro/error-recovery-issue-55897.stderr @@ -1,5 +1,5 @@ error: environment variable `NON_EXISTENT` not defined at compile time - --> $DIR/issue-55897.rs:10:22 + --> $DIR/error-recovery-issue-55897.rs:10:22 | LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); | ^^^^^^^^^^^^^^^^^^^^ @@ -8,13 +8,13 @@ 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:15:22 + --> $DIR/error-recovery-issue-55897.rs:15:22 | LL | include!(concat!("NON_EXISTENT"suffix, "/data.rs")); | ^^^^^^^^^^^^^^^^^^^^ invalid suffix `suffix` error[E0432]: unresolved import `prelude` - --> $DIR/issue-55897.rs:1:5 + --> $DIR/error-recovery-issue-55897.rs:1:5 | LL | use prelude::*; | ^^^^^^^ @@ -23,7 +23,7 @@ LL | use prelude::*; | help: a similar path exists: `std::prelude` error[E0432]: unresolved import `env` - --> $DIR/issue-55897.rs:4:9 + --> $DIR/error-recovery-issue-55897.rs:4:9 | LL | use env; | ^^^ no `env` in the root diff --git a/tests/ui/extenv/issue-110547.rs b/tests/ui/env-macro/name-whitespace-issue-110547.rs similarity index 100% rename from tests/ui/extenv/issue-110547.rs rename to tests/ui/env-macro/name-whitespace-issue-110547.rs diff --git a/tests/ui/extenv/issue-110547.stderr b/tests/ui/env-macro/name-whitespace-issue-110547.stderr similarity index 87% rename from tests/ui/extenv/issue-110547.stderr rename to tests/ui/env-macro/name-whitespace-issue-110547.stderr index 10589ec2f54a4..5f34904d4ae01 100644 --- a/tests/ui/extenv/issue-110547.stderr +++ b/tests/ui/env-macro/name-whitespace-issue-110547.stderr @@ -1,5 +1,5 @@ error: environment variable `\t` not defined at compile time - --> $DIR/issue-110547.rs:4:5 + --> $DIR/name-whitespace-issue-110547.rs:4:5 | LL | env!{"\t"}; | ^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | env!{"\t"}; = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) error: environment variable `\t` not defined at compile time - --> $DIR/issue-110547.rs:5:5 + --> $DIR/name-whitespace-issue-110547.rs:5:5 | LL | env!("\t"); | ^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | env!("\t"); = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) error: environment variable `\u{2069}` not defined at compile time - --> $DIR/issue-110547.rs:6:5 + --> $DIR/name-whitespace-issue-110547.rs:6:5 | LL | env!("\u{2069}"); | ^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extoption_env-no-args.rs b/tests/ui/env-macro/option_env-no-args.rs similarity index 100% rename from tests/ui/extoption_env-no-args.rs rename to tests/ui/env-macro/option_env-no-args.rs diff --git a/tests/ui/extoption_env-no-args.stderr b/tests/ui/env-macro/option_env-no-args.stderr similarity index 78% rename from tests/ui/extoption_env-no-args.stderr rename to tests/ui/env-macro/option_env-no-args.stderr index d40f905b6659d..d621aff770d32 100644 --- a/tests/ui/extoption_env-no-args.stderr +++ b/tests/ui/env-macro/option_env-no-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-no-args.rs:1:13 + --> $DIR/option_env-no-args.rs:1:13 | LL | fn main() { option_env!(); } | ^^^^^^^^^^^^^ diff --git a/tests/ui/extoption_env-not-defined.rs b/tests/ui/env-macro/option_env-not-defined.rs similarity index 100% rename from tests/ui/extoption_env-not-defined.rs rename to tests/ui/env-macro/option_env-not-defined.rs diff --git a/tests/ui/extoption_env-not-string-literal.rs b/tests/ui/env-macro/option_env-not-string-literal.rs similarity index 100% rename from tests/ui/extoption_env-not-string-literal.rs rename to tests/ui/env-macro/option_env-not-string-literal.rs diff --git a/tests/ui/extoption_env-not-string-literal.stderr b/tests/ui/env-macro/option_env-not-string-literal.stderr similarity index 75% rename from tests/ui/extoption_env-not-string-literal.stderr rename to tests/ui/env-macro/option_env-not-string-literal.stderr index d4fec1b45c9d3..3d2542a0e6c68 100644 --- a/tests/ui/extoption_env-not-string-literal.stderr +++ b/tests/ui/env-macro/option_env-not-string-literal.stderr @@ -1,5 +1,5 @@ error: argument must be a string literal - --> $DIR/extoption_env-not-string-literal.rs:1:25 + --> $DIR/option_env-not-string-literal.rs:1:25 | LL | fn main() { option_env!(10); } | ^^ diff --git a/tests/ui/extoption_env-too-many-args.rs b/tests/ui/env-macro/option_env-too-many-args.rs similarity index 100% rename from tests/ui/extoption_env-too-many-args.rs rename to tests/ui/env-macro/option_env-too-many-args.rs diff --git a/tests/ui/extoption_env-too-many-args.stderr b/tests/ui/env-macro/option_env-too-many-args.stderr similarity index 78% rename from tests/ui/extoption_env-too-many-args.stderr rename to tests/ui/env-macro/option_env-too-many-args.stderr index c7aeaac75dd6d..b4da3670787d3 100644 --- a/tests/ui/extoption_env-too-many-args.stderr +++ b/tests/ui/env-macro/option_env-too-many-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-too-many-args.rs:1:13 + --> $DIR/option_env-too-many-args.rs:1:13 | LL | fn main() { option_env!("one", "two"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^