Rollup merge of #126526 - Enselic:non-snake-case, r=jieyouxu

tests/ui/lint: Move 19 tests to new `non-snake-case` subdir Mainly so that it is easier to only run all `non_snake_case`-lint-specific tests with: ./x test tests/ui/lint/non-snake-case But also to reduce the size of the large `tests/ui/lint` directory. And rename some tests to pass tidy, and remove them from `src/tools/tidy/src/issues.txt`.
rust-lang · Jun 15, 2024 · f788ea4 · f788ea4
2 parents b6311b3 + b717aa1
commit f788ea4
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 8 deletions.
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
@@ -2760,7 +2760,6 @@ ui/lint/issue-1866.rs
 ui/lint/issue-19102.rs
 ui/lint/issue-20343.rs
 ui/lint/issue-30302.rs
-ui/lint/issue-31924-non-snake-ffi.rs
 ui/lint/issue-34798.rs
 ui/lint/issue-35075.rs
 ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
@@ -2769,15 +2768,13 @@ ui/lint/issue-54099-camel-case-underscore-types.rs
 ui/lint/issue-57410-1.rs
 ui/lint/issue-57410.rs
 ui/lint/issue-63364.rs
-ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
 ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
 ui/lint/issue-79546-fuel-ice.rs
 ui/lint/issue-79744.rs
 ui/lint/issue-80988.rs
 ui/lint/issue-81218.rs
 ui/lint/issue-83477.rs
 ui/lint/issue-87274-paren-parent.rs
-ui/lint/issue-89469.rs
 ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
 ui/lint/issue-97094.rs
 ui/lint/issue-99387.rs

diff --git a/tests/ui/lint/issue-89469.rs → ...e-case-field-destructuring-issue-89469.rs b/tests/ui/lint/issue-89469.rs → ...e-case-field-destructuring-issue-89469.rs
diff --git a/.../ui/lint/lint-non-snake-case-crate-bin.rs → ...ake-case/lint-non-snake-case-crate-bin.rs b/.../ui/lint/lint-non-snake-case-crate-bin.rs → ...ake-case/lint-non-snake-case-crate-bin.rs
diff --git a/...ui/lint/lint-non-snake-case-crate-bin2.rs → ...ke-case/lint-non-snake-case-crate-bin2.rs b/...ui/lint/lint-non-snake-case-crate-bin2.rs → ...ke-case/lint-non-snake-case-crate-bin2.rs
diff --git a/...ui/lint/lint-non-snake-case-crate-bin3.rs → ...ke-case/lint-non-snake-case-crate-bin3.rs b/...ui/lint/lint-non-snake-case-crate-bin3.rs → ...ke-case/lint-non-snake-case-crate-bin3.rs
diff --git a/.../lint/lint-non-snake-case-crate-cdylib.rs → ...-case/lint-non-snake-case-crate-cdylib.rs b/.../lint/lint-non-snake-case-crate-cdylib.rs → ...-case/lint-non-snake-case-crate-cdylib.rs
diff --git a/...t/lint-non-snake-case-crate-cdylib.stderr → ...e/lint-non-snake-case-crate-cdylib.stderr b/...t/lint-non-snake-case-crate-cdylib.stderr → ...e/lint-non-snake-case-crate-cdylib.stderr
diff --git a/...i/lint/lint-non-snake-case-crate-dylib.rs → ...e-case/lint-non-snake-case-crate-dylib.rs b/...i/lint/lint-non-snake-case-crate-dylib.rs → ...e-case/lint-non-snake-case-crate-dylib.rs
diff --git a/...nt/lint-non-snake-case-crate-dylib.stderr → ...se/lint-non-snake-case-crate-dylib.stderr b/...nt/lint-non-snake-case-crate-dylib.stderr → ...se/lint-non-snake-case-crate-dylib.stderr
diff --git a/.../ui/lint/lint-non-snake-case-crate-lib.rs → ...ake-case/lint-non-snake-case-crate-lib.rs b/.../ui/lint/lint-non-snake-case-crate-lib.rs → ...ake-case/lint-non-snake-case-crate-lib.rs
diff --git a/...lint/lint-non-snake-case-crate-lib.stderr → ...case/lint-non-snake-case-crate-lib.stderr b/...lint/lint-non-snake-case-crate-lib.stderr → ...case/lint-non-snake-case-crate-lib.stderr
diff --git a/...t/lint-non-snake-case-crate-proc-macro.rs → ...e/lint-non-snake-case-crate-proc-macro.rs b/...t/lint-non-snake-case-crate-proc-macro.rs → ...e/lint-non-snake-case-crate-proc-macro.rs
diff --git a/...nt-non-snake-case-crate-proc-macro.stderr → ...nt-non-snake-case-crate-proc-macro.stderr b/...nt-non-snake-case-crate-proc-macro.stderr → ...nt-non-snake-case-crate-proc-macro.stderr
diff --git a/...ui/lint/lint-non-snake-case-crate-rlib.rs → ...ke-case/lint-non-snake-case-crate-rlib.rs b/...ui/lint/lint-non-snake-case-crate-rlib.rs → ...ke-case/lint-non-snake-case-crate-rlib.rs
diff --git a/...int/lint-non-snake-case-crate-rlib.stderr → ...ase/lint-non-snake-case-crate-rlib.stderr b/...int/lint-non-snake-case-crate-rlib.stderr → ...ase/lint-non-snake-case-crate-rlib.stderr
diff --git a/...nt/lint-non-snake-case-crate-staticlib.rs → ...se/lint-non-snake-case-crate-staticlib.rs b/...nt/lint-non-snake-case-crate-staticlib.rs → ...se/lint-non-snake-case-crate-staticlib.rs
diff --git a/...int-non-snake-case-crate-staticlib.stderr → ...int-non-snake-case-crate-staticlib.stderr b/...int-non-snake-case-crate-staticlib.stderr → ...int-non-snake-case-crate-staticlib.stderr
diff --git a/.../ui/lint/lint-non-snake-case-functions.rs → ...ake-case/lint-non-snake-case-functions.rs b/.../ui/lint/lint-non-snake-case-functions.rs → ...ake-case/lint-non-snake-case-functions.rs
diff --git a/...lint/lint-non-snake-case-functions.stderr → ...case/lint-non-snake-case-functions.stderr b/...lint/lint-non-snake-case-functions.stderr → ...case/lint-non-snake-case-functions.stderr
diff --git a/...e-case-identifiers-suggestion-reserved.rs → ...e-case-identifiers-suggestion-reserved.rs b/...e-case-identifiers-suggestion-reserved.rs → ...e-case-identifiers-suggestion-reserved.rs
diff --git a/...se-identifiers-suggestion-reserved.stderr → ...se-identifiers-suggestion-reserved.stderr b/...se-identifiers-suggestion-reserved.stderr → ...se-identifiers-suggestion-reserved.stderr
diff --git a/.../ui/lint/lint-non-snake-case-lifetimes.rs → ...ake-case/lint-non-snake-case-lifetimes.rs b/.../ui/lint/lint-non-snake-case-lifetimes.rs → ...ake-case/lint-non-snake-case-lifetimes.rs
diff --git a/...lint/lint-non-snake-case-lifetimes.stderr → ...case/lint-non-snake-case-lifetimes.stderr b/...lint/lint-non-snake-case-lifetimes.stderr → ...case/lint-non-snake-case-lifetimes.stderr
diff --git a/tests/ui/lint/lint-non-snake-case-modules.rs → ...snake-case/lint-non-snake-case-modules.rs b/tests/ui/lint/lint-non-snake-case-modules.rs → ...snake-case/lint-non-snake-case-modules.rs
diff --git a/...i/lint/lint-non-snake-case-modules.stderr → ...e-case/lint-non-snake-case-modules.stderr b/...i/lint/lint-non-snake-case-modules.stderr → ...e-case/lint-non-snake-case-modules.stderr
diff --git a/...non-snake-case-no-lowercase-equivalent.rs → ...non-snake-case-no-lowercase-equivalent.rs b/...non-snake-case-no-lowercase-equivalent.rs → ...non-snake-case-no-lowercase-equivalent.rs
diff --git a/.../lint/lint-nonstandard-style-unicode-2.rs → ...-case/lint-nonstandard-style-unicode-2.rs b/.../lint/lint-nonstandard-style-unicode-2.rs → ...-case/lint-nonstandard-style-unicode-2.rs
diff --git a/...t/lint-nonstandard-style-unicode-2.stderr → ...e/lint-nonstandard-style-unicode-2.stderr b/...t/lint-nonstandard-style-unicode-2.stderr → ...e/lint-nonstandard-style-unicode-2.stderr
diff --git a/tests/ui/lint/lint-uppercase-variables.rs → ...on-snake-case/lint-uppercase-variables.rs b/tests/ui/lint/lint-uppercase-variables.rs → ...on-snake-case/lint-uppercase-variables.rs
diff --git a/...s/ui/lint/lint-uppercase-variables.stderr → ...nake-case/lint-uppercase-variables.stderr b/...s/ui/lint/lint-uppercase-variables.stderr → ...nake-case/lint-uppercase-variables.stderr
diff --git a/...2-no-snake-case-warning-for-field-puns.rs → ...ase-warning-for-field-puns-issue-66362.rs b/...2-no-snake-case-warning-for-field-puns.rs → ...ase-warning-for-field-puns-issue-66362.rs
diff --git a/...-snake-case-warning-for-field-puns.stderr → ...warning-for-field-puns-issue-66362.stderr b/...-snake-case-warning-for-field-puns.stderr → ...warning-for-field-puns-issue-66362.stderr
@@ -1,29 +1,29 @@
 error: structure field `lowerCamelCaseName` should have a snake case name
-  --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:7:9
+  --> $DIR/no-snake-case-warning-for-field-puns-issue-66362.rs:7:9
    |
 LL |         lowerCamelCaseName: bool,
    |         ^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `lower_camel_case_name`
    |
 note: the lint level is defined here
-  --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:1:9
+  --> $DIR/no-snake-case-warning-for-field-puns-issue-66362.rs:1:9
    |
 LL | #![deny(non_snake_case)]
    |         ^^^^^^^^^^^^^^
 
 error: variable `lowerCamelCaseBinding` should have a snake case name
-  --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:20:38
+  --> $DIR/no-snake-case-warning-for-field-puns-issue-66362.rs:20:38
    |
 LL |         Foo::Good { snake_case_name: lowerCamelCaseBinding } => { }
    |                                      ^^^^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `lower_camel_case_binding`
 
 error: variable `anotherLowerCamelCaseBinding` should have a snake case name
-  --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:24:41
+  --> $DIR/no-snake-case-warning-for-field-puns-issue-66362.rs:24:41
    |
 LL |     if let Foo::Good { snake_case_name: anotherLowerCamelCaseBinding } = b { }
    |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `another_lower_camel_case_binding`
 
 error: variable `yetAnotherLowerCamelCaseBinding` should have a snake case name
-  --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:27:43
+  --> $DIR/no-snake-case-warning-for-field-puns-issue-66362.rs:27:43
    |
 LL |     if let Foo::Bad { lowerCamelCaseName: yetAnotherLowerCamelCaseBinding } = b { }
    |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `yet_another_lower_camel_case_binding`

diff --git a/tests/ui/lint/issue-31924-non-snake-ffi.rs → ...n-snake-case/non-snake-ffi-issue-31924.rs b/tests/ui/lint/issue-31924-non-snake-ffi.rs → ...n-snake-case/non-snake-ffi-issue-31924.rs