Move `option_env!` and `env!` tests to the `env-macro` directory

30 files changed, 18 insertions, 20 deletions

diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 0ef962c2df8..03e4ecca9d6 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 c946554b98f..22927cffd1b 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
index 66dced478f9..66dced478f9 100644
--- a/tests/ui/extenv/extenv-arg-2-not-string-literal.rs
+++ b/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
index 9db1c0be746..843ce4823ea 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
index b3497ffbc88..b3497ffbc88 100644
--- a/tests/ui/extenv/extenv-env-overload.rs
+++ b/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
index 18226256b64..18226256b64 100644
--- a/tests/ui/extenv/extenv-env.rs
+++ b/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
index d898feb78c6..d898feb78c6 100644
--- a/tests/ui/extenv/extenv-escaped-var.rs
+++ b/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
index ef5e654d054..53a2ead6742 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
index 2ff6d242b27..2ff6d242b27 100644
--- a/tests/ui/extenv/extenv-no-args.rs
+++ b/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
index 36d485676c2..3a94b36cd0f 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
index 30b72783f5c..30b72783f5c 100644
--- a/tests/ui/extenv/extenv-not-defined-custom.rs
+++ b/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
index 9b6e32bc95f..70c41bcc52e 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
index 1fb046c78f2..1fb046c78f2 100644
--- a/tests/ui/extenv/extenv-not-defined-default.rs
+++ b/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
index 5198818f89c..efd7fdb4e53 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
index e903eab4e96..e903eab4e96 100644
--- a/tests/ui/extenv/extenv-not-env.rs
+++ b/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
index 3eaa0b5daaf..3eaa0b5daaf 100644
--- a/tests/ui/extenv/extenv-not-string-literal.rs
+++ b/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
index 85ed442e2fe..0985459eff9 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
index ffad1c51303..ffad1c51303 100644
--- a/tests/ui/extenv/extenv-too-many-args.rs
+++ b/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
index c0fd5d57251..f156026846a 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
index b6500e54059..b6500e54059 100644
--- a/tests/ui/extenv/issue-55897.rs
+++ b/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
index 2e8c05cca86..5a20bf8b168 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
index 2acfb2e671e..2acfb2e671e 100644
--- a/tests/ui/extenv/issue-110547.rs
+++ b/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
index 10589ec2f54..5f34904d4ae 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
index bc5f77bc62e..bc5f77bc62e 100644
--- a/tests/ui/extoption_env-no-args.rs
+++ b/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
index d40f905b665..d621aff770d 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
index 90a01a80313..90a01a80313 100644
--- a/tests/ui/extoption_env-not-defined.rs
+++ b/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
index 27c3a8e83db..27c3a8e83db 100644
--- a/tests/ui/extoption_env-not-string-literal.rs
+++ b/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
index d4fec1b45c9..3d2542a0e6c 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
index ecc8b61ac85..ecc8b61ac85 100644
--- a/tests/ui/extoption_env-too-many-args.rs
+++ b/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
index c7aeaac75dd..b4da3670787 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"); }
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^