Rollup merge of rust-lang#122657 - beetrees:option-env-tests, r=compiler-errors,Nilstrieb

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

This PR moves the `option_env!` tests to there own directory (`extoption_env`), matching the naming convention used by the tests for `env!` (which live in the `extenv` directory).

Author: matthiaskrgr

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",

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

tests/ui/extenv/extenv-arg-2-not-string-literal.rs renamed to tests/ui/env-macro/env-arg-2-not-string-literal.rs

@@ -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); }
    |                         ^^

tests/ui/extenv/extenv-arg-2-not-string-literal.stderr renamed to tests/ui/env-macro/env-arg-2-not-string-literal.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");
    |     ^^^^^^^^^^

tests/ui/extenv/extenv-env-overload.rs renamed to tests/ui/env-macro/env-env-overload.rs

@@ -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!(); }
    |             ^^^^^^