Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 3651401

Browse files
committed
Move option_env! and env! tests to the env-macro directory
1 parent 35dfc67 commit 3651401

30 files changed

+18
-20
lines changed

src/tools/tidy/src/issues.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,6 @@
968968
"ui/errors/issue-89280-emitter-overflow-splice-lines.rs",
969969
"ui/errors/issue-99572-impl-trait-on-pointer.rs",
970970
"ui/expr/if/issue-4201.rs",
971-
"ui/extenv/issue-110547.rs",
972-
"ui/extenv/issue-55897.rs",
973971
"ui/extern/auxiliary/issue-80074-macro-2.rs",
974972
"ui/extern/auxiliary/issue-80074-macro.rs",
975973
"ui/extern/issue-10025.rs",

src/tools/tidy/src/ui_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900;
1818
// FIXME: The following limits should be reduced eventually.
1919

2020
const ISSUES_ENTRY_LIMIT: usize = 1750;
21-
const ROOT_ENTRY_LIMIT: usize = 866;
21+
const ROOT_ENTRY_LIMIT: usize = 859;
2222

2323
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2424
"rs", // test source files

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected string literal
2-
--> $DIR/extenv-arg-2-not-string-literal.rs:1:25
2+
--> $DIR/env-arg-2-not-string-literal.rs:1:25
33
|
44
LL | fn main() { env!("one", 10); }
55
| ^^
File renamed without changes.

tests/ui/extenv/extenv-escaped-var.stderr renamed to tests/ui/env-macro/env-escaped-var.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: environment variable `\t` not defined at compile time
2-
--> $DIR/extenv-escaped-var.rs:2:5
2+
--> $DIR/env-escaped-var.rs:2:5
33
|
44
LL | env!("\t");
55
| ^^^^^^^^^^
File renamed without changes.

tests/ui/extenv/extenv-no-args.stderr renamed to tests/ui/env-macro/env-no-args.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `env!()` takes 1 or 2 arguments
2-
--> $DIR/extenv-no-args.rs:1:13
2+
--> $DIR/env-no-args.rs:1:13
33
|
44
LL | fn main() { env!(); }
55
| ^^^^^^

0 commit comments

Comments
 (0)