Skip to content

Commit 5559313

Browse files
authored
Rollup merge of #146490 - Oneirical:uncountable-integer-12, r=jieyouxu
Rehome 26 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [#5 of Batch #2] Part of #133895 Methodology: 1. Refer to the previously written `tests/ui/SUMMARY.md` 2. Find an appropriate category for the test, using the original issue thread and the test contents. 3. Add the issue URL at the bottom (not at the top, as that would mess up stderr line numbers) 4. Rename the tests to make their purpose clearer Inspired by the methodology that Kivooeo was using. r? ```@jieyouxu```
2 parents 8f11852 + 926599a commit 5559313

File tree

54 files changed

+154
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+154
-34
lines changed

tests/ui/mismatched_types/mismatched-types-in-trait-implementation-87490.stderr renamed to tests/ui/associated-types/mismatched-types-in-associated-type-87490.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/mismatched-types-in-trait-implementation-87490.rs:10:5
2+
--> $DIR/mismatched-types-in-associated-type-87490.rs:10:5
33
|
44
LL | fn follow(_: &str) -> <&str as StreamOnce>::Position {
55
| ------------------------------ expected `usize` because of return type

tests/ui/issues/issue-72076.rs renamed to tests/ui/associated-types/missing-default-associated-type-72076.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// https://github.com/rust-lang/rust/issues/72076
12
trait X {
23
type S;
34
fn f() -> Self::S {} //~ ERROR mismatched types

tests/ui/issues/issue-72076.stderr renamed to tests/ui/associated-types/missing-default-associated-type-72076.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/issue-72076.rs:3:23
2+
--> $DIR/missing-default-associated-type-72076.rs:4:23
33
|
44
LL | fn f() -> Self::S {}
55
| ^^ expected associated type, found `()`

tests/ui/binding/invalid-assignment-in-while-loop-77218.stderr renamed to tests/ui/binding/invalid-assignment-in-while-77218.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0070]: invalid left-hand side of assignment
2-
--> $DIR/invalid-assignment-in-while-loop-77218.rs:5:19
2+
--> $DIR/invalid-assignment-in-while-77218.rs:5:19
33
|
44
LL | while Some(0) = value.get(0) {}
55
| - ^

tests/ui/issues/issue-70724-add_type_neq_err_label-unwrap.rs renamed to tests/ui/binop/binary-operation-error-on-function-70724.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// https://github.com/rust-lang/rust/issues/70724
12
fn a() -> i32 {
23
3
34
}

0 commit comments

Comments
 (0)