Skip to content

Commit 0e2b849

Browse files
adwinwhiteadwinwhite
committed
bless more affected tests
1 parent cb2d69e commit 0e2b849

12 files changed

+135
-20
lines changed

‎tests/ui/coroutine/layout-error.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub type F = impl Future;
2020

2121
#[define_opaque(F)]
2222
fn foo()
23+
//~^ ERROR: inconsistency during normalizing env
2324
where
2425
F:,
2526
{
@@ -28,6 +29,7 @@ where
2829
}
2930

3031
Task::spawn(&POOL, || cb());
32+
//~^ ERROR: inconsistency during normalizing env
3133
}
3234

3335
// Check that statics are inhabited computes they layout.

‎tests/ui/coroutine/layout-error.stderr‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
11
error[E0425]: cannot find value `Foo` in this scope
2-
--> $DIR/layout-error.rs:27:17
2+
--> $DIR/layout-error.rs:28:17
33
|
44
LL | let a = Foo;
55
| ^^^ not found in this scope
66

7-
error: aborting due to 1 previous error
7+
error: inconsistency during normalizing env `Binder { value: WellFormed(Term::Ty(Alias(Free, AliasTy { args: [], def_id: DefId(0:13 ~ layout_error[b009]::F), .. }))), bound_vars: [] }`, old=Binder { value: WellFormed(Term::Ty(Alias(Free, AliasTy { args: [], def_id: DefId(0:13 ~ layout_error[b009]::F), .. }))), bound_vars: [] }, next=Some(
8+
Binder { value: WellFormed(Term::Ty(Alias(Opaque, AliasTy { args: [], def_id: DefId(0:14 ~ layout_error[b009]::F::{opaque#0}), .. }))), bound_vars: [] },
9+
)
10+
--> $DIR/layout-error.rs:22:1
11+
|
12+
LL | / fn foo()
13+
LL | |
14+
LL | | where
15+
LL | | F:,
16+
| |_______^
17+
18+
error: inconsistency during normalizing env `Binder { value: WellFormed(Term::Ty(Alias(Free, AliasTy { args: [], def_id: DefId(0:13 ~ layout_error[b009]::F), .. }))), bound_vars: [] }`, old=Binder { value: WellFormed(Term::Ty(Alias(Free, AliasTy { args: [], def_id: DefId(0:13 ~ layout_error[b009]::F), .. }))), bound_vars: [] }, next=Some(
19+
Binder { value: WellFormed(Term::Ty(Alias(Opaque, AliasTy { args: [], def_id: DefId(0:14 ~ layout_error[b009]::F::{opaque#0}), .. }))), bound_vars: [] },
20+
)
21+
--> $DIR/layout-error.rs:31:24
22+
|
23+
LL | Task::spawn(&POOL, || cb());
24+
| ^^
25+
26+
error: aborting due to 3 previous errors
827

928
For more information about this error, try `rustc --explain E0425`.

‎tests/ui/specialization/fuzzed/fuzzing-ice-134905.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ where
1414
}
1515

1616
trait Check {}
17-
impl<'a, T> Eq for T where <T as Iterate<'a>>::Ty: Valid {}
17+
impl<'a, T> Eq for T
1818
//~^ ERROR type parameter `T` must be used as the type parameter for some local type
19+
where
20+
T: Iterate<'a>,
21+
<T as Iterate<'a>>::Ty: Valid,
22+
{}
1923

2024
trait Valid {}
2125

‎tests/ui/specialization/fuzzed/fuzzing-ice-134905.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LL | default type Ty = ();
1515
| ^^ the trait `Valid` is not implemented for `()`
1616
|
1717
help: this trait has no implementations, consider adding one
18-
--> $DIR/fuzzing-ice-134905.rs:20:1
18+
--> $DIR/fuzzing-ice-134905.rs:24:1
1919
|
2020
LL | trait Valid {}
2121
| ^^^^^^^^^^^
@@ -28,7 +28,7 @@ LL | type Ty: Valid;
2828
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2929
--> $DIR/fuzzing-ice-134905.rs:17:10
3030
|
31-
LL | impl<'a, T> Eq for T where <T as Iterate<'a>>::Ty: Valid {}
31+
LL | impl<'a, T> Eq for T
3232
| ^ type parameter `T` must be used as the type parameter for some local type
3333
|
3434
= note: implementing a foreign trait is only possible if at least one of the types for which it is implemented is local

‎tests/ui/specialization/issue-38091-2.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ build-fail
2-
//~^ ERROR overflow evaluating the requirement `i32: Check`
3-
41
#![feature(specialization)]
52
//~^ WARN the feature `specialization` is incomplete
63

@@ -17,7 +14,11 @@ where
1714
}
1815

1916
trait Check {}
20-
impl<'a, T> Check for T where <T as Iterate<'a>>::Ty: Valid {}
17+
impl<'a, T> Check for T
18+
//~^ ERROR: overflow evaluating the requirement `T: Check`
19+
where
20+
T: Iterate<'a>,
21+
<T as Iterate<'a>>::Ty: Valid {}
2122

2223
trait Valid {}
2324

‎tests/ui/specialization/issue-38091-2.stderr‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/issue-38091-2.rs:4:12
2+
--> $DIR/issue-38091-2.rs:1:12
33
|
44
LL | #![feature(specialization)]
55
| ^^^^^^^^^^^^^^
@@ -8,16 +8,35 @@ LL | #![feature(specialization)]
88
= help: consider using `min_specialization` instead, which is more stable and complete
99
= note: `#[warn(incomplete_features)]` on by default
1010

11-
error[E0275]: overflow evaluating the requirement `i32: Check`
11+
error[E0275]: overflow evaluating the requirement `T: Check`
12+
--> $DIR/issue-38091-2.rs:17:1
1213
|
13-
note: required for `i32` to implement `Iterate<'_>`
14-
--> $DIR/issue-38091-2.rs:11:13
14+
LL | / impl<'a, T> Check for T
15+
LL | |
16+
LL | | where
17+
LL | | T: Iterate<'a>,
18+
LL | | <T as Iterate<'a>>::Ty: Valid {}
19+
| |_________________________________^
20+
|
21+
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_38091_2`)
22+
note: required for `T` to implement `Iterate<'_>`
23+
--> $DIR/issue-38091-2.rs:8:13
1524
|
1625
LL | impl<'a, T> Iterate<'a> for T
1726
| ^^^^^^^^^^^ ^
1827
LL | where
1928
LL | T: Check,
2029
| ----- unsatisfied trait bound introduced here
30+
note: required for `T` to implement `Check`
31+
--> $DIR/issue-38091-2.rs:17:13
32+
|
33+
LL | impl<'a, T> Check for T
34+
| ^^^^^ ^
35+
...
36+
LL | <T as Iterate<'a>>::Ty: Valid {}
37+
| ----- unsatisfied trait bound introduced here
38+
= note: 125 redundant requirements hidden
39+
= note: required for `T` to implement `Iterate<'a>`
2140

2241
error: aborting due to 1 previous error; 1 warning emitted
2342

‎tests/ui/specialization/issue-38091.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ where
1515
}
1616

1717
trait Check {}
18-
impl<'a, T> Check for T where <T as Iterate<'a>>::Ty: Valid {}
18+
impl<'a, T> Check for T
19+
//~^ ERROR: overflow evaluating the requirement `T: Check`
20+
where
21+
T: Iterate<'a>,
22+
<T as Iterate<'a>>::Ty: Valid,
23+
{}
1924

2025
trait Valid {}
2126

‎tests/ui/specialization/issue-38091.stderr‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LL | default type Ty = ();
1515
| ^^ the trait `Valid` is not implemented for `()`
1616
|
1717
help: this trait has no implementations, consider adding one
18-
--> $DIR/issue-38091.rs:20:1
18+
--> $DIR/issue-38091.rs:25:1
1919
|
2020
LL | trait Valid {}
2121
| ^^^^^^^^^^^
@@ -25,6 +25,37 @@ note: required by a bound in `Iterate::Ty`
2525
LL | type Ty: Valid;
2626
| ^^^^^ required by this bound in `Iterate::Ty`
2727

28-
error: aborting due to 1 previous error; 1 warning emitted
28+
error[E0275]: overflow evaluating the requirement `T: Check`
29+
--> $DIR/issue-38091.rs:18:1
30+
|
31+
LL | / impl<'a, T> Check for T
32+
LL | |
33+
LL | | where
34+
LL | | T: Iterate<'a>,
35+
LL | | <T as Iterate<'a>>::Ty: Valid,
36+
| |__________________________________^
37+
|
38+
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_38091`)
39+
note: required for `T` to implement `Iterate<'_>`
40+
--> $DIR/issue-38091.rs:8:13
41+
|
42+
LL | impl<'a, T> Iterate<'a> for T
43+
| ^^^^^^^^^^^ ^
44+
LL | where
45+
LL | T: Check,
46+
| ----- unsatisfied trait bound introduced here
47+
note: required for `T` to implement `Check`
48+
--> $DIR/issue-38091.rs:18:13
49+
|
50+
LL | impl<'a, T> Check for T
51+
| ^^^^^ ^
52+
...
53+
LL | <T as Iterate<'a>>::Ty: Valid,
54+
| ----- unsatisfied trait bound introduced here
55+
= note: 125 redundant requirements hidden
56+
= note: required for `T` to implement `Iterate<'a>`
57+
58+
error: aborting due to 2 previous errors; 1 warning emitted
2959

30-
For more information about this error, try `rustc --explain E0277`.
60+
Some errors have detailed explanations: E0275, E0277.
61+
For more information about an error, try `rustc --explain E0275`.

‎tests/ui/type-alias-impl-trait/in-assoc-ty-early-bound2.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ trait Foo {
88
impl Foo for () {
99
type Assoc<'a> = impl Sized;
1010
fn bar<'a: 'a>()
11+
//~^ ERROR: inconsistency during normalizing env
1112
where
1213
Self::Assoc<'a>:,
1314
{
1415
let _ = |x: &'a ()| {
16+
//~^ ERROR: inconsistency during normalizing env
1517
let _: Self::Assoc<'a> = x;
1618
//~^ ERROR expected generic lifetime parameter, found `'_`
1719
};

‎tests/ui/type-alias-impl-trait/in-assoc-ty-early-bound2.stderr‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
1+
error: inconsistency during normalizing env `Binder { value: WellFormed(Term::Ty(Alias(Projection, AliasTy { args: [(), 'a/#0], def_id: DefId(0:4 ~ in_assoc_ty_early_bound2[a84a]::Foo::Assoc), .. }))), bound_vars: [] }`, old=Binder { value: WellFormed(Term::Ty(Alias(Projection, AliasTy { args: [(), 'a/#0], def_id: DefId(0:4 ~ in_assoc_ty_early_bound2[a84a]::Foo::Assoc), .. }))), bound_vars: [] }, next=Some(
2+
Binder { value: WellFormed(Term::Ty(Alias(Opaque, AliasTy { args: ['a/#0, 'a/#0], def_id: DefId(0:11 ~ in_assoc_ty_early_bound2[a84a]::{impl#0}::Assoc::{opaque#0}), .. }))), bound_vars: [] },
3+
)
4+
--> $DIR/in-assoc-ty-early-bound2.rs:10:5
5+
|
6+
LL | / fn bar<'a: 'a>()
7+
LL | |
8+
LL | | where
9+
LL | | Self::Assoc<'a>:,
10+
| |_________________________^
11+
12+
error: inconsistency during normalizing env `Binder { value: WellFormed(Term::Ty(Alias(Projection, AliasTy { args: [(), 'a/#0], def_id: DefId(0:4 ~ in_assoc_ty_early_bound2[a84a]::Foo::Assoc), .. }))), bound_vars: [] }`, old=Binder { value: WellFormed(Term::Ty(Alias(Projection, AliasTy { args: [(), 'a/#0], def_id: DefId(0:4 ~ in_assoc_ty_early_bound2[a84a]::Foo::Assoc), .. }))), bound_vars: [] }, next=Some(
13+
Binder { value: WellFormed(Term::Ty(Alias(Opaque, AliasTy { args: ['a/#0, 'a/#0], def_id: DefId(0:11 ~ in_assoc_ty_early_bound2[a84a]::{impl#0}::Assoc::{opaque#0}), .. }))), bound_vars: [] },
14+
)
15+
--> $DIR/in-assoc-ty-early-bound2.rs:15:17
16+
|
17+
LL | let _ = |x: &'a ()| {
18+
| ^^^^^^^^^^^
19+
120
error[E0792]: expected generic lifetime parameter, found `'_`
2-
--> $DIR/in-assoc-ty-early-bound2.rs:15:20
21+
--> $DIR/in-assoc-ty-early-bound2.rs:17:20
322
|
423
LL | type Assoc<'a> = impl Sized;
524
| -- this generic parameter must be used with a generic lifetime parameter
625
...
726
LL | let _: Self::Assoc<'a> = x;
827
| ^^^^^^^^^^^^^^^
928

10-
error: aborting due to 1 previous error
29+
error: aborting due to 3 previous errors
1130

1231
For more information about this error, try `rustc --explain E0792`.

0 commit comments

Comments
 (0)