Skip to content

Commit c11f113

Browse files
committed
Bless changes in squiggly line lengths
1 parent c7e02ef commit c11f113

File tree

6 files changed

+25
-28
lines changed

6 files changed

+25
-28
lines changed

tests/ui/associated-inherent-types/issue-111404-1.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ LL | fn bar(_: fn(Foo<for<'b> fn(Foo<fn(&'b ())>::Assoc)>::Assoc)) {}
3232
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
3333

3434
error: higher-ranked subtype error
35-
--> $DIR/issue-111404-1.rs:10:1
35+
--> $DIR/issue-111404-1.rs:10:8
3636
|
3737
LL | fn bar(_: fn(Foo<for<'b> fn(Foo<fn(&'b ())>::Assoc)>::Assoc)) {}
38-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
39-
|
40-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38+
| ^
4139

4240
error: aborting due to 5 previous errors
4341

tests/ui/higher-ranked/higher-ranked-lifetime-error.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: implementation of `FnMut` is not general enough
22
--> $DIR/higher-ranked-lifetime-error.rs:12:5
33
|
44
LL | assert_all::<_, &String>(id);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `FnMut` is not general enough
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `FnMut` is not general enough
66
|
77
= note: `for<'a> fn(&'a String) -> &'a String {id}` must implement `FnMut<(&String,)>`
88
= note: ...but it actually implements `FnMut<(&'0 String,)>`, for some specific lifetime `'0`

tests/ui/higher-ranked/trait-bounds/due-to-where-clause.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: implementation of `Foo` is not general enough
22
--> $DIR/due-to-where-clause.rs:2:5
33
|
44
LL | test::<FooS>(&mut 42);
5-
| ^^^^^^^^^^^^ implementation of `Foo` is not general enough
5+
| ^^^^^^^^^^^^^^^^^^^^^ implementation of `Foo` is not general enough
66
|
77
= note: `FooS<'_>` must implement `Foo<'0>`, for any lifetime `'0`...
88
= note: ...but `FooS<'_>` actually implements `Foo<'1>`, for some specific lifetime `'1`

tests/ui/mismatched_types/hr-projection-mismatch.current.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/hr-projection-mismatch.rs:20:5
33
|
44
LL | wrap::<_, Thing>();
5-
| ^^^^^^^^^^^^^^^^ one type is more general than the other
5+
| ^^^^^^^^^^^^^^^^^^ one type is more general than the other
66
|
77
= note: expected reference `&'a _`
88
found reference `&_`

tests/ui/nll/ice-106874.stderr

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ LL | A(B(C::new(D::new(move |st| f(st)))))
1717
= note: ...but it actually implements `FnOnce<(&'1 mut V,)>`, for some specific lifetime `'1`
1818
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
1919

20+
error: implementation of `FnOnce` is not general enough
21+
--> $DIR/ice-106874.rs:8:7
22+
|
23+
LL | A(B(C::new(D::new(move |st| f(st)))))
24+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough
25+
|
26+
= note: closure with signature `fn(&'2 mut V)` must implement `FnOnce<(&'1 mut V,)>`, for any lifetime `'1`...
27+
= note: ...but it actually implements `FnOnce<(&'2 mut V,)>`, for some specific lifetime `'2`
28+
2029
error: implementation of `Fn` is not general enough
2130
--> $DIR/ice-106874.rs:8:7
2231
|
@@ -34,6 +43,7 @@ LL | A(B(C::new(D::new(move |st| f(st)))))
3443
|
3544
= note: closure with signature `fn(&'2 mut V)` must implement `FnOnce<(&'1 mut V,)>`, for any lifetime `'1`...
3645
= note: ...but it actually implements `FnOnce<(&'2 mut V,)>`, for some specific lifetime `'2`
46+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
3747

3848
error: implementation of `Fn` is not general enough
3949
--> $DIR/ice-106874.rs:8:7
@@ -46,45 +56,36 @@ LL | A(B(C::new(D::new(move |st| f(st)))))
4656
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
4757

4858
error: implementation of `FnOnce` is not general enough
49-
--> $DIR/ice-106874.rs:8:9
59+
--> $DIR/ice-106874.rs:8:7
5060
|
5161
LL | A(B(C::new(D::new(move |st| f(st)))))
52-
| ^^^^^^ implementation of `FnOnce` is not general enough
62+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough
5363
|
5464
= note: closure with signature `fn(&'2 mut V)` must implement `FnOnce<(&'1 mut V,)>`, for any lifetime `'1`...
5565
= note: ...but it actually implements `FnOnce<(&'2 mut V,)>`, for some specific lifetime `'2`
66+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
5667

5768
error: implementation of `Fn` is not general enough
58-
--> $DIR/ice-106874.rs:8:9
69+
--> $DIR/ice-106874.rs:8:7
5970
|
6071
LL | A(B(C::new(D::new(move |st| f(st)))))
61-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Fn` is not general enough
72+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Fn` is not general enough
6273
|
6374
= note: closure with signature `fn(&'2 mut V)` must implement `Fn<(&'1 mut V,)>`, for any lifetime `'1`...
6475
= note: ...but it actually implements `Fn<(&'2 mut V,)>`, for some specific lifetime `'2`
65-
66-
error: implementation of `FnOnce` is not general enough
67-
--> $DIR/ice-106874.rs:8:9
68-
|
69-
LL | A(B(C::new(D::new(move |st| f(st)))))
70-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough
71-
|
72-
= note: closure with signature `fn(&'2 mut V)` must implement `FnOnce<(&'1 mut V,)>`, for any lifetime `'1`...
73-
= note: ...but it actually implements `FnOnce<(&'2 mut V,)>`, for some specific lifetime `'2`
76+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
7477

7578
error: higher-ranked subtype error
76-
--> $DIR/ice-106874.rs:8:41
79+
--> $DIR/ice-106874.rs:8:7
7780
|
7881
LL | A(B(C::new(D::new(move |st| f(st)))))
79-
| ^
82+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8083

8184
error: higher-ranked subtype error
8285
--> $DIR/ice-106874.rs:8:41
8386
|
8487
LL | A(B(C::new(D::new(move |st| f(st)))))
8588
| ^
86-
|
87-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
8889

8990
error: aborting due to 10 previous errors
9091

tests/ui/nll/missing-universe-cause-issue-114907.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,16 @@ LL | accept(callback);
3838
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
3939

4040
error: higher-ranked subtype error
41-
--> $DIR/missing-universe-cause-issue-114907.rs:33:21
41+
--> $DIR/missing-universe-cause-issue-114907.rs:33:5
4242
|
4343
LL | accept(callback);
44-
| ^
44+
| ^^^^^^^^^^^^^^^^
4545

4646
error: higher-ranked subtype error
4747
--> $DIR/missing-universe-cause-issue-114907.rs:33:21
4848
|
4949
LL | accept(callback);
5050
| ^
51-
|
52-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
5351

5452
error: aborting due to 6 previous errors
5553

0 commit comments

Comments
 (0)