Skip to content

Commit 5bd4e83

Browse files
authored
Rollup merge of #144553 - Oneirical:uncountable-integer-4, r=jieyouxu
Rehome 32 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` #143902 divided into smaller, easier to review chunks. 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 18eeac0 + aa54396 commit 5bd4e83

File tree

48 files changed

+83
-54
lines changed

Some content is hidden

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

48 files changed

+83
-54
lines changed

tests/ui/issues/issue-23442.rs renamed to tests/ui/associated-types/unioned-keys-with-associated-type-23442.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/23442
12
//@ check-pass
23
#![allow(dead_code)]
34
use std::marker::PhantomData;

tests/ui/issues/issue-91489.rs renamed to tests/ui/autoref-autoderef/auto-deref-on-cow-regression-91489.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/91489
12
//@ check-pass
23

34
// regression test for #91489

tests/ui/issues/issue-9725.rs renamed to tests/ui/binding/struct-destructuring-repeated-bindings-9725.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/9725
12
struct A { foo: isize }
23

34
fn main() {

tests/ui/issues/issue-9725.stderr renamed to tests/ui/binding/struct-destructuring-repeated-bindings-9725.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0416]: identifier `foo` is bound more than once in the same pattern
2-
--> $DIR/issue-9725.rs:4:18
2+
--> $DIR/struct-destructuring-repeated-bindings-9725.rs:5:18
33
|
44
LL | let A { foo, foo } = A { foo: 3 };
55
| ^^^ used in a pattern more than once
66

77
error[E0025]: field `foo` bound multiple times in the pattern
8-
--> $DIR/issue-9725.rs:4:18
8+
--> $DIR/struct-destructuring-repeated-bindings-9725.rs:5:18
99
|
1010
LL | let A { foo, foo } = A { foo: 3 };
1111
| --- ^^^ multiple uses of `foo` in pattern

tests/ui/issues/issue-9942.rs renamed to tests/ui/cast/constant-expression-cast-9942.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/9942
12
//@ run-pass
23

34
pub fn main() {

tests/ui/issues/issue-9129.rs renamed to tests/ui/closures/closure-type-inference-in-context-9129.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/9129
12
//@ run-pass
23
#![allow(dead_code)]
34
#![allow(non_camel_case_types)]

tests/ui/issues/issue-9951.rs renamed to tests/ui/coercion/trait-object-coercion-distribution-9951.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/9951
12
//@ run-pass
23

34
#![allow(unused_variables)]

tests/ui/issues/issue-9951.stderr renamed to tests/ui/coercion/trait-object-coercion-distribution-9951.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: method `noop` is never used
2-
--> $DIR/issue-9951.rs:6:6
2+
--> $DIR/trait-object-coercion-distribution-9951.rs:7:6
33
|
44
LL | trait Bar {
55
| --- method in this trait

tests/ui/issues/issue-98299.rs renamed to tests/ui/const-generics/try-from-with-const-genericsrs-98299.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/98299
12
use std::convert::TryFrom;
23

34
pub fn test_usage(p: ()) {

tests/ui/issues/issue-98299.stderr renamed to tests/ui/const-generics/try-from-with-const-genericsrs-98299.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0284]: type annotations needed for `SmallCString<_>`
2-
--> $DIR/issue-98299.rs:4:36
2+
--> $DIR/try-from-with-const-genericsrs-98299.rs:5:36
33
|
44
LL | SmallCString::try_from(p).map(|cstr| cstr);
55
| ------------ ^^^^
66
| |
77
| type must be known at this point
88
|
99
note: required by a const generic parameter in `SmallCString`
10-
--> $DIR/issue-98299.rs:10:25
10+
--> $DIR/try-from-with-const-genericsrs-98299.rs:11:25
1111
|
1212
LL | pub struct SmallCString<const N: usize> {}
1313
| ^^^^^^^^^^^^^^ required by this const generic parameter in `SmallCString`
@@ -17,15 +17,15 @@ LL | SmallCString::try_from(p).map(|cstr: SmallCString<N>| cstr);
1717
| +++++++++++++++++
1818

1919
error[E0284]: type annotations needed for `SmallCString<_>`
20-
--> $DIR/issue-98299.rs:4:36
20+
--> $DIR/try-from-with-const-genericsrs-98299.rs:5:36
2121
|
2222
LL | SmallCString::try_from(p).map(|cstr| cstr);
2323
| ------------ ^^^^
2424
| |
2525
| type must be known at this point
2626
|
2727
note: required for `SmallCString<_>` to implement `TryFrom<()>`
28-
--> $DIR/issue-98299.rs:12:22
28+
--> $DIR/try-from-with-const-genericsrs-98299.rs:13:22
2929
|
3030
LL | impl<const N: usize> TryFrom<()> for SmallCString<N> {
3131
| -------------- ^^^^^^^^^^^ ^^^^^^^^^^^^^^^
@@ -37,15 +37,15 @@ LL | SmallCString::try_from(p).map(|cstr: SmallCString<N>| cstr);
3737
| +++++++++++++++++
3838

3939
error[E0284]: type annotations needed for `SmallCString<_>`
40-
--> $DIR/issue-98299.rs:4:36
40+
--> $DIR/try-from-with-const-genericsrs-98299.rs:5:36
4141
|
4242
LL | SmallCString::try_from(p).map(|cstr| cstr);
4343
| ------------------------- ^^^^
4444
| |
4545
| type must be known at this point
4646
|
4747
note: required for `SmallCString<_>` to implement `TryFrom<()>`
48-
--> $DIR/issue-98299.rs:12:22
48+
--> $DIR/try-from-with-const-genericsrs-98299.rs:13:22
4949
|
5050
LL | impl<const N: usize> TryFrom<()> for SmallCString<N> {
5151
| -------------- ^^^^^^^^^^^ ^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)