Skip to content

Commit 602a2ff

Browse files
authored
Unrolled build for #142171
Rollup merge of #142171 - Kivooeo:tf7, r=workingjubilee `tests/ui`: A New Order [7/N] > [!NOTE] > > Intermediate commits are intended to help review, but will be squashed prior to merge. Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of #133895.
2 parents c31cccb + 85ce9ee commit 602a2ff

10 files changed

+18
-19
lines changed

tests/ui/custom_attribute.rs renamed to tests/ui/attributes/attr_unknown_custom_attr.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Checks error handling for undefined custom attributes.
2+
13
#![feature(stmt_expr_attributes)]
24

35
#[foo] //~ ERROR cannot find attribute `foo` in this scope

tests/ui/custom_attribute.stderr renamed to tests/ui/attributes/attr_unknown_custom_attr.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error: cannot find attribute `foo` in this scope
2-
--> $DIR/custom_attribute.rs:3:3
2+
--> $DIR/attr_unknown_custom_attr.rs:5:3
33
|
44
LL | #[foo]
55
| ^^^
66

77
error: cannot find attribute `foo` in this scope
8-
--> $DIR/custom_attribute.rs:5:7
8+
--> $DIR/attr_unknown_custom_attr.rs:7:7
99
|
1010
LL | #[foo]
1111
| ^^^
1212

1313
error: cannot find attribute `foo` in this scope
14-
--> $DIR/custom_attribute.rs:7:7
14+
--> $DIR/attr_unknown_custom_attr.rs:9:7
1515
|
1616
LL | #[foo]
1717
| ^^^

tests/ui/crate-name-mismatch.rs renamed to tests/ui/attributes/crate-name-mismatch.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Checks error handling for mismatched `--crate-name` and `#![crate_name]` values.
2+
13
//@ compile-flags: --crate-name foo
24

35
#![crate_name = "bar"]

tests/ui/crate-name-mismatch.stderr renamed to tests/ui/attributes/crate-name-mismatch.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
2-
--> $DIR/crate-name-mismatch.rs:3:1
2+
--> $DIR/crate-name-mismatch.rs:5:1
33
|
44
LL | #![crate_name = "bar"]
55
| ^^^^^^^^^^^^^^^^^^^^^^

tests/ui/custom-attribute-multisegment.rs renamed to tests/ui/attributes/custom_attr_multisegment_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Unresolved multi-segment attributes are not treated as custom.
1+
//! Unresolved multi-segment attributes are not treated as custom.
22
33
mod existent {}
44

tests/ui/custom-attribute-multisegment.stderr renamed to tests/ui/attributes/custom_attr_multisegment_error.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0433]: failed to resolve: could not find `nonexistent` in `existent`
2-
--> $DIR/custom-attribute-multisegment.rs:5:13
2+
--> $DIR/custom_attr_multisegment_error.rs:5:13
33
|
44
LL | #[existent::nonexistent]
55
| ^^^^^^^^^^^ could not find `nonexistent` in `existent`

tests/ui/default-method-parsing.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/ui/deep.rs renamed to tests/ui/runtime/deep_recursion.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Checks deep recursion behavior.
2+
13
//@ run-pass
24
//@ ignore-emscripten apparently blows the stack
35

tests/ui/custom-test-frameworks-simple.rs renamed to tests/ui/test-attrs/custom_test_frameworks_simple.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Checks run with a custom test framework and indexed test functions.
2+
13
//@ compile-flags: --test
24
//@ run-pass
35

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//@ run-pass
1+
//! Checks basic default method functionality.
22
3-
#![allow(dead_code)]
3+
//@ run-pass
44

55
trait Foo {
66
fn f(&self) {
@@ -10,9 +10,7 @@ trait Foo {
1010
fn g(&self);
1111
}
1212

13-
struct A {
14-
x: isize
15-
}
13+
struct A;
1614

1715
impl Foo for A {
1816
fn g(&self) {
@@ -21,6 +19,6 @@ impl Foo for A {
2119
}
2220

2321
pub fn main() {
24-
let a = A { x: 1 };
22+
let a = A;
2523
a.f();
2624
}

0 commit comments

Comments
 (0)