cleaned up some tests

rust-lang · bors · Jun 9, 2025 · Jun 4, 2025 · Jun 5, 2025 · Jun 5, 2025
commit 85ce9ee481a56bcabaa9480cfc0e2b420e4f1807
diff --git a/tests/ui/custom_attribute.rs → ...ui/attributes/attr_unknown_custom_attr.rs b/tests/ui/custom_attribute.rs → ...ui/attributes/attr_unknown_custom_attr.rs
@@ -1,3 +1,5 @@
+//! Checks error handling for undefined custom attributes.
+
 #![feature(stmt_expr_attributes)]
 
 #[foo] //~ ERROR cannot find attribute `foo` in this scope

diff --git a/tests/ui/custom_attribute.stderr → ...ttributes/attr_unknown_custom_attr.stderr b/tests/ui/custom_attribute.stderr → ...ttributes/attr_unknown_custom_attr.stderr
@@ -1,17 +1,17 @@
 error: cannot find attribute `foo` in this scope
-  --> $DIR/custom_attribute.rs:3:3
+  --> $DIR/attr_unknown_custom_attr.rs:5:3
    |
 LL | #[foo]
    |   ^^^
 
 error: cannot find attribute `foo` in this scope
-  --> $DIR/custom_attribute.rs:5:7
+  --> $DIR/attr_unknown_custom_attr.rs:7:7
    |
 LL |     #[foo]
    |       ^^^
 
 error: cannot find attribute `foo` in this scope
-  --> $DIR/custom_attribute.rs:7:7
+  --> $DIR/attr_unknown_custom_attr.rs:9:7
    |
 LL |     #[foo]
    |       ^^^

diff --git a/tests/ui/crate-name-mismatch.rs → tests/ui/attributes/crate-name-mismatch.rs b/tests/ui/crate-name-mismatch.rs → tests/ui/attributes/crate-name-mismatch.rs
@@ -1,3 +1,5 @@
+//! Checks error handling for mismatched `--crate-name` and `#![crate_name]` values.
+
 //@ compile-flags: --crate-name foo
 
 #![crate_name = "bar"]

diff --git a/tests/ui/crate-name-mismatch.stderr → .../ui/attributes/crate-name-mismatch.stderr b/tests/ui/crate-name-mismatch.stderr → .../ui/attributes/crate-name-mismatch.stderr
@@ -1,5 +1,5 @@
 error: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
-  --> $DIR/crate-name-mismatch.rs:3:1
+  --> $DIR/crate-name-mismatch.rs:5:1
    |
 LL | #![crate_name = "bar"]
    | ^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/ui/custom-attribute-multisegment.rs → ...ributes/custom_attr_multisegment_error.rs b/tests/ui/custom-attribute-multisegment.rs → ...ributes/custom_attr_multisegment_error.rs
@@ -1,4 +1,4 @@
-// Unresolved multi-segment attributes are not treated as custom.
+//! Unresolved multi-segment attributes are not treated as custom.
 
 mod existent {}
 

diff --git a/...s/ui/custom-attribute-multisegment.stderr → ...tes/custom_attr_multisegment_error.stderr b/...s/ui/custom-attribute-multisegment.stderr → ...tes/custom_attr_multisegment_error.stderr
@@ -1,5 +1,5 @@
 error[E0433]: failed to resolve: could not find `nonexistent` in `existent`
-  --> $DIR/custom-attribute-multisegment.rs:5:13
+  --> $DIR/custom_attr_multisegment_error.rs:5:13
    |
 LL | #[existent::nonexistent]
    |             ^^^^^^^^^^^ could not find `nonexistent` in `existent`

diff --git a/tests/ui/default-method-parsing.rs b/tests/ui/default-method-parsing.rs
diff --git a/tests/ui/deep.rs → tests/ui/runtime/deep_recursion.rs b/tests/ui/deep.rs → tests/ui/runtime/deep_recursion.rs
@@ -1,3 +1,5 @@
+//! Checks deep recursion behavior.
+
 //@ run-pass
 //@ ignore-emscripten apparently blows the stack
 

diff --git a/tests/ui/custom-test-frameworks-simple.rs → ...st-attrs/custom_test_frameworks_simple.rs b/tests/ui/custom-test-frameworks-simple.rs → ...st-attrs/custom_test_frameworks_simple.rs
@@ -1,3 +1,5 @@
+//! Checks run with a custom test framework and indexed test functions.
+
 //@ compile-flags: --test
 //@ run-pass
 

diff --git a/tests/ui/default-method-simple.rs → tests/ui/traits/default_method_simple.rs b/tests/ui/default-method-simple.rs → tests/ui/traits/default_method_simple.rs
@@ -1,6 +1,6 @@
-//@ run-pass
+//! Checks basic default method functionality.
 
-#![allow(dead_code)]
+//@ run-pass
 
 trait Foo {
     fn f(&self) {
@@ -10,9 +10,7 @@ trait Foo {
     fn g(&self);
 }
 
-struct A {
-    x: isize
-}
+struct A;
 
 impl Foo for A {
     fn g(&self) {
@@ -21,6 +19,6 @@ impl Foo for A {
 }
 
 pub fn main() {
-    let a = A { x: 1 };
+    let a = A;
     a.f();
 }