Skip to content

Commit 4d95f5b

Browse files
author
Alexander Regueiro
committed
Fixed test stderr files.
1 parent ce9850b commit 4d95f5b

26 files changed

+86
-160
lines changed

src/test/ui/associated-const/associated-const-no-item.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no associated item named `ID` found for type `i32` in the current scope
2-
--> $DIR/associated-const-no-item.rs:16:23
2+
--> $DIR/associated-const-no-item.rs:16:16
33
|
44
LL | const X: i32 = <i32>::ID;
5-
| -------^^
6-
| |
7-
| associated item not found in `i32`
5+
| ^^^^^^^^^ associated item not found in `i32`
86
|
97
= help: items from traits can only be used if the trait is implemented and in scope
108
= note: the following trait defines an item `ID`, perhaps you need to implement it:

src/test/ui/bogus-tag.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0599]: no variant named `hsl` found for type `color` in the current scope
2-
--> $DIR/bogus-tag.rs:18:14
2+
--> $DIR/bogus-tag.rs:18:7
33
|
44
LL | enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), }
55
| ---------- variant `hsl` not found here
66
...
77
LL | color::hsl(h, s, l) => { println!("hsl"); }
8-
| -------^^^--------- variant not found in `color`
8+
| ^^^^^^^^^^^^^^^^^^^ variant not found in `color`
99

1010
error: aborting due to previous error
1111

src/test/ui/did_you_mean/bad-assoc-pat.stderr

+8-16
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,28 @@ LL | &(u8,)::AssocItem => {}
2323
| ^^^^^^^^^^^^^^^^ help: try: `<(u8,)>::AssocItem`
2424

2525
error[E0599]: no associated item named `AssocItem` found for type `[u8]` in the current scope
26-
--> $DIR/bad-assoc-pat.rs:13:15
26+
--> $DIR/bad-assoc-pat.rs:13:9
2727
|
2828
LL | [u8]::AssocItem => {}
29-
| ------^^^^^^^^^
30-
| |
31-
| associated item not found in `[u8]`
29+
| ^^^^^^^^^^^^^^^ associated item not found in `[u8]`
3230

3331
error[E0599]: no associated item named `AssocItem` found for type `(u8, u8)` in the current scope
34-
--> $DIR/bad-assoc-pat.rs:16:19
32+
--> $DIR/bad-assoc-pat.rs:16:9
3533
|
3634
LL | (u8, u8)::AssocItem => {}
37-
| ----------^^^^^^^^^
38-
| |
39-
| associated item not found in `(u8, u8)`
35+
| ^^^^^^^^^^^^^^^^^^^ associated item not found in `(u8, u8)`
4036

4137
error[E0599]: no associated item named `AssocItem` found for type `_` in the current scope
42-
--> $DIR/bad-assoc-pat.rs:19:12
38+
--> $DIR/bad-assoc-pat.rs:19:9
4339
|
4440
LL | _::AssocItem => {}
45-
| ---^^^^^^^^^
46-
| |
47-
| associated item not found in `_`
41+
| ^^^^^^^^^^^^ associated item not found in `_`
4842

4943
error[E0599]: no associated item named `AssocItem` found for type `(u8,)` in the current scope
50-
--> $DIR/bad-assoc-pat.rs:24:17
44+
--> $DIR/bad-assoc-pat.rs:24:10
5145
|
5246
LL | &(u8,)::AssocItem => {}
53-
| -------^^^^^^^^^
54-
| |
55-
| associated item not found in `(u8,)`
47+
| ^^^^^^^^^^^^^^^^ associated item not found in `(u8,)`
5648

5749
error: aborting due to 8 previous errors
5850

src/test/ui/dont-suggest-private-trait-method.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
error[E0599]: no function or associated item named `new` found for type `T` in the current scope
2-
--> $DIR/dont-suggest-private-trait-method.rs:14:8
2+
--> $DIR/dont-suggest-private-trait-method.rs:14:5
33
|
44
LL | struct T;
55
| --------- function or associated item `new` not found for this
66
...
77
LL | T::new();
8-
| ---^^^
9-
| |
10-
| function or associated item not found in `T`
8+
| ^^^^^^ function or associated item not found in `T`
119

1210
error: aborting due to previous error
1311

src/test/ui/empty/empty-struct-braces-expr.stderr

+6-10
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,20 @@ LL | let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1
4747
| did you mean `XEmpty1 { /* fields */ }`?
4848

4949
error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
50-
--> $DIR/empty-struct-braces-expr.rs:32:19
50+
--> $DIR/empty-struct-braces-expr.rs:32:15
5151
|
5252
LL | let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for type
53-
| ----^^^^^^
54-
| |
55-
| variant not found in `empty_struct::XE`
53+
| ^^^^^^^^^^ variant not found in `empty_struct::XE`
5654
|
57-
= help: did you mean `XEmpty3`?
55+
= note: did you mean `empty_struct::XE::XEmpty3`?
5856

5957
error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
60-
--> $DIR/empty-struct-braces-expr.rs:33:19
58+
--> $DIR/empty-struct-braces-expr.rs:33:15
6159
|
6260
LL | let xe3 = XE::Empty3(); //~ ERROR no variant named `Empty3` found for type
63-
| ----^^^^^^
64-
| |
65-
| variant not found in `empty_struct::XE`
61+
| ^^^^^^^^^^ variant not found in `empty_struct::XE`
6662
|
67-
= help: did you mean `XEmpty3`?
63+
= note: did you mean `empty_struct::XE::XEmpty3`?
6864

6965
error: aborting due to 8 previous errors
7066

src/test/ui/error-codes/E0599.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the current scope
2-
--> $DIR/E0599.rs:14:20
2+
--> $DIR/E0599.rs:14:15
33
|
44
LL | struct Foo;
55
| ----------- associated item `NotEvenReal` not found for this
66
...
77
LL | || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
8-
| -----^^^^^^^^^^^-- associated item not found in `Foo`
8+
| ^^^^^^^^^^^^^^^^^^ associated item not found in `Foo`
99

1010
error: aborting due to previous error
1111

src/test/ui/invalid/invalid-path-in-const.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no associated item named `DOESNOTEXIST` found for type `u32` in the current scope
2-
--> $DIR/invalid-path-in-const.rs:12:23
2+
--> $DIR/invalid-path-in-const.rs:12:18
33
|
44
LL | fn f(a: [u8; u32::DOESNOTEXIST]) {}
5-
| -----^^^^^^^^^^^^
6-
| |
7-
| associated item not found in `u32`
5+
| ^^^^^^^^^^^^^^^^^ associated item not found in `u32`
86

97
error: aborting due to previous error
108

src/test/ui/issues/issue-22933-2.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
error[E0599]: no variant named `PIE` found for type `Delicious` in the current scope
2-
--> $DIR/issue-22933-2.rs:14:55
2+
--> $DIR/issue-22933-2.rs:14:44
33
|
44
LL | enum Delicious {
55
| -------------- variant `PIE` not found here
66
...
77
LL | ApplePie = Delicious::Apple as isize | Delicious::PIE as isize,
8-
| -----------^^^
9-
| |
10-
| variant not found in `Delicious`
8+
| ^^^^^^^^^^^^^^ variant not found in `Delicious`
119

1210
error: aborting due to previous error
1311

src/test/ui/issues/issue-22933-3.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no associated item named `MIN` found for type `u8` in the current scope
2-
--> $DIR/issue-22933-3.rs:11:22
2+
--> $DIR/issue-22933-3.rs:11:18
33
|
44
LL | const FOO: [u32; u8::MIN as usize] = [];
5-
| ----^^^
6-
| |
7-
| associated item not found in `u8`
5+
| ^^^^^^^ associated item not found in `u8`
86

97
error: aborting due to previous error
108

src/test/ui/issues/issue-23173.stderr

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,38 @@
11
error[E0599]: no variant named `Homura` found for type `Token` in the current scope
2-
--> $DIR/issue-23173.rs:19:23
2+
--> $DIR/issue-23173.rs:19:16
33
|
44
LL | enum Token { LeftParen, RightParen, Plus, Minus, /* etc */ }
55
| ---------- variant `Homura` not found here
66
...
77
LL | use_token(&Token::Homura);
8-
| -------^^^^^^
9-
| |
10-
| variant not found in `Token`
8+
| ^^^^^^^^^^^^^ variant not found in `Token`
119

1210
error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope
13-
--> $DIR/issue-23173.rs:21:13
11+
--> $DIR/issue-23173.rs:21:5
1412
|
1513
LL | struct Struct {
1614
| ------------- function or associated item `method` not found for this
1715
...
1816
LL | Struct::method();
19-
| --------^^^^^^
20-
| |
21-
| function or associated item not found in `Struct`
17+
| ^^^^^^^^^^^^^^ function or associated item not found in `Struct`
2218

2319
error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope
24-
--> $DIR/issue-23173.rs:23:13
20+
--> $DIR/issue-23173.rs:23:5
2521
|
2622
LL | struct Struct {
2723
| ------------- function or associated item `method` not found for this
2824
...
2925
LL | Struct::method;
30-
| --------^^^^^^
31-
| |
32-
| function or associated item not found in `Struct`
26+
| ^^^^^^^^^^^^^^ function or associated item not found in `Struct`
3327

3428
error[E0599]: no associated item named `Assoc` found for type `Struct` in the current scope
35-
--> $DIR/issue-23173.rs:25:13
29+
--> $DIR/issue-23173.rs:25:5
3630
|
3731
LL | struct Struct {
3832
| ------------- associated item `Assoc` not found for this
3933
...
4034
LL | Struct::Assoc;
41-
| --------^^^^^
42-
| |
43-
| associated item not found in `Struct`
35+
| ^^^^^^^^^^^^^ associated item not found in `Struct`
4436

4537
error: aborting due to 4 previous errors
4638

src/test/ui/issues/issue-23217.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
error[E0599]: no variant named `A` found for type `SomeEnum` in the current scope
2-
--> $DIR/issue-23217.rs:12:19
2+
--> $DIR/issue-23217.rs:12:9
33
|
44
LL | pub enum SomeEnum {
55
| ----------------- variant `A` not found here
66
LL | B = SomeEnum::A,
7-
| ----------^
8-
| |
9-
| variant not found in `SomeEnum`
7+
| ^^^^^^^^^^^ variant not found in `SomeEnum`
108
|
11-
= help: did you mean `B`?
9+
= note: did you mean `SomeEnum::B`?
1210

1311
error: aborting due to previous error
1412

src/test/ui/issues/issue-28344.stderr

+4-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
55
| ^^^^^^^^^^^^^ associated type `Output` must be specified
66

77
error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope
8-
--> $DIR/issue-28344.rs:14:25
8+
--> $DIR/issue-28344.rs:14:17
99
|
1010
LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
11-
| --------^^^^^
12-
| |
13-
| function or associated item not found in `dyn std::ops::BitXor<_>`
11+
| ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>`
1412
|
1513
= help: did you mean `bitxor`?
1614

@@ -21,12 +19,10 @@ LL | let g = BitXor::bitor;
2119
| ^^^^^^^^^^^^^ associated type `Output` must be specified
2220

2321
error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope
24-
--> $DIR/issue-28344.rs:18:21
22+
--> $DIR/issue-28344.rs:18:13
2523
|
2624
LL | let g = BitXor::bitor;
27-
| --------^^^^^
28-
| |
29-
| function or associated item not found in `dyn std::ops::BitXor<_>`
25+
| ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>`
3026
|
3127
= help: did you mean `bitxor`?
3228

src/test/ui/issues/issue-28586.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no associated item named `BYTES` found for type `usize` in the current scope
2-
--> $DIR/issue-28586.rs:14:26
2+
--> $DIR/issue-28586.rs:14:19
33
|
44
LL | impl Foo for [u8; usize::BYTES] {}
5-
| -------^^^^^
6-
| |
7-
| associated item not found in `usize`
5+
| ^^^^^^^^^^^^ associated item not found in `usize`
86

97
error: aborting due to previous error
108

src/test/ui/issues/issue-28971.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0599]: no variant named `Baz` found for type `Foo` in the current scope
2-
--> $DIR/issue-28971.rs:19:18
2+
--> $DIR/issue-28971.rs:19:13
33
|
44
LL | enum Foo {
55
| -------- variant `Baz` not found here
66
...
77
LL | Foo::Baz(..) => (),
8-
| -----^^^---- variant not found in `Foo`
8+
| ^^^^^^^^^^^^ variant not found in `Foo`
99
|
10-
= help: did you mean `Bar`?
10+
= note: did you mean `Foo::Bar`?
1111

1212
error: aborting due to previous error
1313

src/test/ui/issues/issue-30123.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no function or associated item named `new_undirected` found for type `issue_30123_aux::Graph<i32, i32>` in the current scope
2-
--> $DIR/issue-30123.rs:17:33
2+
--> $DIR/issue-30123.rs:17:14
33
|
44
LL | let ug = Graph::<i32, i32>::new_undirected();
5-
| -------------------^^^^^^^^^^^^^^
6-
| |
7-
| function or associated item not found in `issue_30123_aux::Graph<i32, i32>`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `issue_30123_aux::Graph<i32, i32>`
86

97
error: aborting due to previous error
108

src/test/ui/issues/issue-38919.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no associated item named `Item` found for type `T` in the current scope
2-
--> $DIR/issue-38919.rs:12:8
2+
--> $DIR/issue-38919.rs:12:5
33
|
44
LL | T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope
5-
| ---^^^^
6-
| |
7-
| associated item not found in `T`
5+
| ^^^^^^^ associated item not found in `T`
86

97
error: aborting due to previous error
108

src/test/ui/issues/issue-39559.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0599]: no function or associated item named `dim` found for type `D` in the current scope
2-
--> $DIR/issue-39559.rs:24:21
2+
--> $DIR/issue-39559.rs:24:18
33
|
44
LL | entries: [T; D::dim()],
5-
| ---^^^
6-
| |
7-
| function or associated item not found in `D`
5+
| ^^^^^^ function or associated item not found in `D`
86
|
97
= help: items from traits can only be used if the trait is implemented and in scope
108
= note: the following trait defines an item `dim`, perhaps you need to implement it:

src/test/ui/issues/issue-3973.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ LL | | }
88
| |_____^ not a member of trait `ToString_`
99

1010
error[E0599]: no function or associated item named `new` found for type `Point` in the current scope
11-
--> $DIR/issue-3973.rs:32:20
11+
--> $DIR/issue-3973.rs:32:13
1212
|
1313
LL | struct Point {
1414
| ------------ function or associated item `new` not found for this
1515
...
1616
LL | let p = Point::new(0.0, 0.0);
17-
| -------^^^
18-
| |
19-
| function or associated item not found in `Point`
17+
| ^^^^^^^^^^ function or associated item not found in `Point`
2018

2119
error: aborting due to 2 previous errors
2220

src/test/ui/issues/issue-42880.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0599]: no associated item named `String` found for type `std::string::String` in the current scope
2-
--> $DIR/issue-42880.rs:14:22
2+
--> $DIR/issue-42880.rs:14:15
33
|
44
LL | let f = |&Value::String(_)| (); //~ ERROR no associated item named
5-
| -------^^^^^^--- associated item not found in `std::string::String`
5+
| ^^^^^^^^^^^^^^^^ associated item not found in `std::string::String`
66

77
error: aborting due to previous error
88

src/test/ui/issues/issue-7950.stderr

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
error[E0599]: no function or associated item named `bar` found for type `Foo` in the current scope
2-
--> $DIR/issue-7950.rs:16:10
2+
--> $DIR/issue-7950.rs:16:5
33
|
44
LL | struct Foo;
55
| ----------- function or associated item `bar` not found for this
66
...
77
LL | Foo::bar();
8-
| -----^^^
9-
| |
10-
| function or associated item not found in `Foo`
8+
| ^^^^^^^^ function or associated item not found in `Foo`
119

1210
error: aborting due to previous error
1311

0 commit comments

Comments
 (0)