Skip to content

Commit 5f50c4a

Browse files
sd234678sd234678
committed
Update stderr files with --bless
1 parent 2386cce commit 5f50c4a

12 files changed

+61
-61
lines changed

‎src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/associated-type-projection-from-supertrait.rs:33:23
2+
--> $DIR/associated-type-projection-from-supertrait.rs:27:23
33
|
44
LL | fn b() { dent(ModelT, Blue); }
55
| ^^^^ expected struct `Black`, found struct `Blue`
@@ -8,7 +8,7 @@ LL | fn b() { dent(ModelT, Blue); }
88
found type `Blue`
99

1010
error[E0308]: mismatched types
11-
--> $DIR/associated-type-projection-from-supertrait.rs:34:23
11+
--> $DIR/associated-type-projection-from-supertrait.rs:28:23
1212
|
1313
LL | fn c() { dent(ModelU, Black); }
1414
| ^^^^^ expected struct `Blue`, found struct `Black`
@@ -17,7 +17,7 @@ LL | fn c() { dent(ModelU, Black); }
1717
found type `Black`
1818

1919
error[E0308]: mismatched types
20-
--> $DIR/associated-type-projection-from-supertrait.rs:40:28
20+
--> $DIR/associated-type-projection-from-supertrait.rs:32:28
2121
|
2222
LL | fn f() { ModelT.chip_paint(Blue); }
2323
| ^^^^ expected struct `Black`, found struct `Blue`
@@ -26,7 +26,7 @@ LL | fn f() { ModelT.chip_paint(Blue); }
2626
found type `Blue`
2727

2828
error[E0308]: mismatched types
29-
--> $DIR/associated-type-projection-from-supertrait.rs:41:28
29+
--> $DIR/associated-type-projection-from-supertrait.rs:33:28
3030
|
3131
LL | fn g() { ModelU.chip_paint(Black); }
3232
| ^^^^^ expected struct `Blue`, found struct `Black`

‎src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
error[E0271]: type mismatch resolving `<ModelT as Vehicle>::Color == Blue`
2-
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:37:10
2+
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:31:10
33
|
44
LL | fn b() { blue_car(ModelT); }
55
| ^^^^^^^^ expected struct `Black`, found struct `Blue`
66
|
77
= note: expected type `Black`
88
found type `Blue`
99
note: required by `blue_car`
10-
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:33:1
10+
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:27:1
1111
|
1212
LL | fn blue_car<C:Car<Color=Blue>>(c: C) {
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1414

1515
error[E0271]: type mismatch resolving `<ModelU as Vehicle>::Color == Black`
16-
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:38:10
16+
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:32:10
1717
|
1818
LL | fn c() { black_car(ModelU); }
1919
| ^^^^^^^^^ expected struct `Blue`, found struct `Black`
2020
|
2121
= note: expected type `Blue`
2222
found type `Black`
2323
note: required by `black_car`
24-
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:30:1
24+
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:24:1
2525
|
2626
LL | fn black_car<C:Car<Color=Black>>(c: C) {
2727
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/hrtb/hrtb-conflate-regions.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `for<'a, 'b> SomeStruct: Foo<(&'a isize, &'b isize)>` is not satisfied
2-
--> $DIR/hrtb-conflate-regions.rs:28:10
2+
--> $DIR/hrtb-conflate-regions.rs:27:10
33
|
44
LL | fn b() { want_foo2::<SomeStruct>(); }
55
| ^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a, 'b> Foo<(&'a isize, &'b isize)>` is not implemented for `SomeStruct`

‎src/test/ui/impl-trait/bound-normalization-fail.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | #![feature(impl_trait_in_bindings)]
77
= note: `#[warn(incomplete_features)]` on by default
88

99
error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as impl_trait::Trait>::Assoc`
10-
--> $DIR/bound-normalization-fail.rs:30:32
10+
--> $DIR/bound-normalization-fail.rs:29:32
1111
|
1212
LL | fn foo_fail<T: Trait>() -> impl FooLike<Output=T::Assoc> {
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found associated type
@@ -17,13 +17,13 @@ LL | fn foo_fail<T: Trait>() -> impl FooLike<Output=T::Assoc> {
1717
= note: the return type of a function must have a statically known size
1818

1919
error: `impl Trait` return type cannot contain a projection or `Self` that references lifetimes from a parent scope
20-
--> $DIR/bound-normalization-fail.rs:47:41
20+
--> $DIR/bound-normalization-fail.rs:45:41
2121
|
2222
LL | fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output=T::Assoc> {
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2424

2525
error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as lifetimes::Trait<'static>>::Assoc`
26-
--> $DIR/bound-normalization-fail.rs:47:41
26+
--> $DIR/bound-normalization-fail.rs:45:41
2727
|
2828
LL | fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output=T::Assoc> {
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found associated type

‎src/test/ui/issues/issue-12028.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0284]: type annotations required: cannot resolve `<_ as StreamHasher>::S == <H as StreamHasher>::S`
2-
--> $DIR/issue-12028.rs:29:14
2+
--> $DIR/issue-12028.rs:27:14
33
|
44
LL | self.input_stream(&mut stream);
55
| ^^^^^^^^^^^^

‎src/test/ui/regions/regions-outlives-projection-container-hrtb.migrate.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
error[E0491]: in type `&'a WithHrAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
2-
--> $DIR/regions-outlives-projection-container-hrtb.rs:35:12
2+
--> $DIR/regions-outlives-projection-container-hrtb.rs:30:12
33
|
44
LL | let _: &'a WithHrAssoc<TheType<'b>> = loop { };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
note: the pointer is valid for the lifetime 'a as defined on the function body at 32:15
8-
--> $DIR/regions-outlives-projection-container-hrtb.rs:32:15
7+
note: the pointer is valid for the lifetime 'a as defined on the function body at 27:15
8+
--> $DIR/regions-outlives-projection-container-hrtb.rs:27:15
99
|
1010
LL | fn with_assoc<'a,'b>() {
1111
| ^^
12-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 32:18
13-
--> $DIR/regions-outlives-projection-container-hrtb.rs:32:18
12+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 27:18
13+
--> $DIR/regions-outlives-projection-container-hrtb.rs:27:18
1414
|
1515
LL | fn with_assoc<'a,'b>() {
1616
| ^^
1717

1818
error[E0491]: in type `&'a WithHrAssocSub<TheType<'b>>`, reference has a longer lifetime than the data it references
19-
--> $DIR/regions-outlives-projection-container-hrtb.rs:57:12
19+
--> $DIR/regions-outlives-projection-container-hrtb.rs:50:12
2020
|
2121
LL | let _: &'a WithHrAssocSub<TheType<'b>> = loop { };
2222
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2323
|
24-
note: the pointer is valid for the lifetime 'a as defined on the function body at 53:19
25-
--> $DIR/regions-outlives-projection-container-hrtb.rs:53:19
24+
note: the pointer is valid for the lifetime 'a as defined on the function body at 46:19
25+
--> $DIR/regions-outlives-projection-container-hrtb.rs:46:19
2626
|
2727
LL | fn with_assoc_sub<'a,'b>() {
2828
| ^^
29-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 53:22
30-
--> $DIR/regions-outlives-projection-container-hrtb.rs:53:22
29+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 46:22
30+
--> $DIR/regions-outlives-projection-container-hrtb.rs:46:22
3131
|
3232
LL | fn with_assoc_sub<'a,'b>() {
3333
| ^^

‎src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime may not live long enough
2-
--> $DIR/regions-outlives-projection-container-hrtb.rs:35:12
2+
--> $DIR/regions-outlives-projection-container-hrtb.rs:30:12
33
|
44
LL | fn with_assoc<'a,'b>() {
55
| -- -- lifetime `'b` defined here
@@ -10,7 +10,7 @@ LL | let _: &'a WithHrAssoc<TheType<'b>> = loop { };
1010
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type annotation requires that `'b` must outlive `'a`
1111

1212
error: lifetime may not live long enough
13-
--> $DIR/regions-outlives-projection-container-hrtb.rs:57:12
13+
--> $DIR/regions-outlives-projection-container-hrtb.rs:50:12
1414
|
1515
LL | fn with_assoc_sub<'a,'b>() {
1616
| -- -- lifetime `'b` defined here

‎src/test/ui/regions/regions-outlives-projection-container-wc.migrate.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0491]: in type `&'a WithAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
2-
--> $DIR/regions-outlives-projection-container-wc.rs:37:12
2+
--> $DIR/regions-outlives-projection-container-wc.rs:33:12
33
|
44
LL | let _: &'a WithAssoc<TheType<'b>> = loop { };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
note: the pointer is valid for the lifetime 'a as defined on the function body at 31:15
8-
--> $DIR/regions-outlives-projection-container-wc.rs:31:15
7+
note: the pointer is valid for the lifetime 'a as defined on the function body at 27:15
8+
--> $DIR/regions-outlives-projection-container-wc.rs:27:15
99
|
1010
LL | fn with_assoc<'a,'b>() {
1111
| ^^
12-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 31:18
13-
--> $DIR/regions-outlives-projection-container-wc.rs:31:18
12+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 27:18
13+
--> $DIR/regions-outlives-projection-container-wc.rs:27:18
1414
|
1515
LL | fn with_assoc<'a,'b>() {
1616
| ^^

‎src/test/ui/regions/regions-outlives-projection-container-wc.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime may not live long enough
2-
--> $DIR/regions-outlives-projection-container-wc.rs:37:12
2+
--> $DIR/regions-outlives-projection-container-wc.rs:33:12
33
|
44
LL | fn with_assoc<'a,'b>() {
55
| -- -- lifetime `'b` defined here

‎src/test/ui/regions/regions-outlives-projection-container.stderr

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
error[E0491]: in type `&'a WithAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
2-
--> $DIR/regions-outlives-projection-container.rs:40:13
2+
--> $DIR/regions-outlives-projection-container.rs:36:13
33
|
44
LL | let _x: &'a WithAssoc<TheType<'b>> = loop { };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
note: the pointer is valid for the lifetime 'a as defined on the function body at 32:15
8-
--> $DIR/regions-outlives-projection-container.rs:32:15
7+
note: the pointer is valid for the lifetime 'a as defined on the function body at 28:15
8+
--> $DIR/regions-outlives-projection-container.rs:28:15
99
|
1010
LL | fn with_assoc<'a,'b>() {
1111
| ^^
12-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 32:18
13-
--> $DIR/regions-outlives-projection-container.rs:32:18
12+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 28:18
13+
--> $DIR/regions-outlives-projection-container.rs:28:18
1414
|
1515
LL | fn with_assoc<'a,'b>() {
1616
| ^^
1717

1818
error[E0491]: in type `&'a WithoutAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
19-
--> $DIR/regions-outlives-projection-container.rs:58:13
19+
--> $DIR/regions-outlives-projection-container.rs:54:13
2020
|
2121
LL | let _x: &'a WithoutAssoc<TheType<'b>> = loop { };
2222
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2323
|
24-
note: the pointer is valid for the lifetime 'a as defined on the function body at 54:18
25-
--> $DIR/regions-outlives-projection-container.rs:54:18
24+
note: the pointer is valid for the lifetime 'a as defined on the function body at 50:18
25+
--> $DIR/regions-outlives-projection-container.rs:50:18
2626
|
2727
LL | fn without_assoc<'a,'b>() {
2828
| ^^
29-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 54:21
30-
--> $DIR/regions-outlives-projection-container.rs:54:21
29+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 50:21
30+
--> $DIR/regions-outlives-projection-container.rs:50:21
3131
|
3232
LL | fn without_assoc<'a,'b>() {
3333
| ^^
3434

3535
error[E0491]: in type `&'a WithAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
36-
--> $DIR/regions-outlives-projection-container.rs:67:12
36+
--> $DIR/regions-outlives-projection-container.rs:63:12
3737
|
3838
LL | call::<&'a WithAssoc<TheType<'b>>>();
3939
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4040
|
41-
note: the pointer is valid for the lifetime 'a as defined on the function body at 62:20
42-
--> $DIR/regions-outlives-projection-container.rs:62:20
41+
note: the pointer is valid for the lifetime 'a as defined on the function body at 58:20
42+
--> $DIR/regions-outlives-projection-container.rs:58:20
4343
|
4444
LL | fn call_with_assoc<'a,'b>() {
4545
| ^^
46-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 62:23
47-
--> $DIR/regions-outlives-projection-container.rs:62:23
46+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 58:23
47+
--> $DIR/regions-outlives-projection-container.rs:58:23
4848
|
4949
LL | fn call_with_assoc<'a,'b>() {
5050
| ^^
5151

5252
error[E0491]: in type `&'a WithoutAssoc<TheType<'b>>`, reference has a longer lifetime than the data it references
53-
--> $DIR/regions-outlives-projection-container.rs:74:12
53+
--> $DIR/regions-outlives-projection-container.rs:70:12
5454
|
5555
LL | call::<&'a WithoutAssoc<TheType<'b>>>();
5656
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5757
|
58-
note: the pointer is valid for the lifetime 'a as defined on the function body at 71:23
59-
--> $DIR/regions-outlives-projection-container.rs:71:23
58+
note: the pointer is valid for the lifetime 'a as defined on the function body at 67:23
59+
--> $DIR/regions-outlives-projection-container.rs:67:23
6060
|
6161
LL | fn call_without_assoc<'a,'b>() {
6262
| ^^
63-
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 71:26
64-
--> $DIR/regions-outlives-projection-container.rs:71:26
63+
note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 67:26
64+
--> $DIR/regions-outlives-projection-container.rs:67:26
6565
|
6666
LL | fn call_without_assoc<'a,'b>() {
6767
| ^^

‎src/test/ui/specialization/defaultimpl/specialization-no-default.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0520]: `foo` specializes an item from a parent `impl`, but that item is not marked `default`
2-
--> $DIR/specialization-no-default.rs:22:5
2+
--> $DIR/specialization-no-default.rs:20:5
33
|
44
LL | / impl<T> Foo for T {
55
LL | | fn foo(&self) {}
@@ -13,7 +13,7 @@ LL | fn foo(&self) {}
1313
= note: to specialize, `foo` in the parent `impl` must be marked `default`
1414

1515
error[E0520]: `bar` specializes an item from a parent `impl`, but that item is not marked `default`
16-
--> $DIR/specialization-no-default.rs:25:5
16+
--> $DIR/specialization-no-default.rs:23:5
1717
|
1818
LL | / impl<T> Foo for T {
1919
LL | | fn foo(&self) {}
@@ -27,7 +27,7 @@ LL | fn bar(&self) {}
2727
= note: to specialize, `bar` in the parent `impl` must be marked `default`
2828

2929
error[E0520]: `T` specializes an item from a parent `impl`, but that item is not marked `default`
30-
--> $DIR/specialization-no-default.rs:41:5
30+
--> $DIR/specialization-no-default.rs:37:5
3131
|
3232
LL | / impl<T> Bar for T {
3333
LL | | type T = u8;
@@ -40,7 +40,7 @@ LL | type T = ();
4040
= note: to specialize, `T` in the parent `impl` must be marked `default`
4141

4242
error[E0520]: `baz` specializes an item from a parent `impl`, but that item is not marked `default`
43-
--> $DIR/specialization-no-default.rs:61:5
43+
--> $DIR/specialization-no-default.rs:55:5
4444
|
4545
LL | / impl<T: Clone> Baz for T {
4646
LL | | fn baz(&self) {}
@@ -53,7 +53,7 @@ LL | fn baz(&self) {}
5353
= note: to specialize, `baz` in the parent `impl` must be marked `default`
5454

5555
error[E0520]: `redundant` specializes an item from a parent `impl`, but that item is not marked `default`
56-
--> $DIR/specialization-no-default.rs:82:5
56+
--> $DIR/specialization-no-default.rs:74:5
5757
|
5858
LL | / impl<T: Clone> Redundant for T {
5959
LL | | fn redundant(&self) {}

‎src/test/ui/specialization/specialization-no-default.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0520]: `foo` specializes an item from a parent `impl`, but that item is not marked `default`
2-
--> $DIR/specialization-no-default.rs:22:5
2+
--> $DIR/specialization-no-default.rs:20:5
33
|
44
LL | / impl<T> Foo for T {
55
LL | | fn foo(&self) {}
@@ -13,7 +13,7 @@ LL | fn foo(&self) {}
1313
= note: to specialize, `foo` in the parent `impl` must be marked `default`
1414

1515
error[E0520]: `bar` specializes an item from a parent `impl`, but that item is not marked `default`
16-
--> $DIR/specialization-no-default.rs:25:5
16+
--> $DIR/specialization-no-default.rs:23:5
1717
|
1818
LL | / impl<T> Foo for T {
1919
LL | | fn foo(&self) {}
@@ -27,7 +27,7 @@ LL | fn bar(&self) {}
2727
= note: to specialize, `bar` in the parent `impl` must be marked `default`
2828

2929
error[E0520]: `T` specializes an item from a parent `impl`, but that item is not marked `default`
30-
--> $DIR/specialization-no-default.rs:41:5
30+
--> $DIR/specialization-no-default.rs:37:5
3131
|
3232
LL | / impl<T> Bar for T {
3333
LL | | type T = u8;
@@ -40,7 +40,7 @@ LL | type T = ();
4040
= note: to specialize, `T` in the parent `impl` must be marked `default`
4141

4242
error[E0520]: `baz` specializes an item from a parent `impl`, but that item is not marked `default`
43-
--> $DIR/specialization-no-default.rs:61:5
43+
--> $DIR/specialization-no-default.rs:55:5
4444
|
4545
LL | / impl<T: Clone> Baz for T {
4646
LL | | fn baz(&self) {}
@@ -53,7 +53,7 @@ LL | fn baz(&self) {}
5353
= note: to specialize, `baz` in the parent `impl` must be marked `default`
5454

5555
error[E0520]: `redundant` specializes an item from a parent `impl`, but that item is not marked `default`
56-
--> $DIR/specialization-no-default.rs:82:5
56+
--> $DIR/specialization-no-default.rs:74:5
5757
|
5858
LL | / impl<T: Clone> Redundant for T {
5959
LL | | fn redundant(&self) {}

0 commit comments

Comments
 (0)