user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Auto merge of #91491 - spastorino:revert-91354, r=oli-obk"

Browse source 
This reverts commit ff2439b7b9, reversing
changes made to 2a9e0831d6.
This commit is contained in:
Deadbeef 2021-12-12 12:34:46 +08:00
parent c5f8788d8d
commit 84b1d859c8
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
49 changed files with 400 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/infinite/infinite-struct.stderr
View file

@ -19,7 +19,7 @@ LL | struct Take(Take);
| ^^^^^^^^^^^^^^^^^^
|
= note: ...which immediately requires computing drop-check constraints for `Take` again
= note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing }, value: Take } }`
= note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing, constness: NotConst }, value: Take } }`
error: aborting due to 2 previous errors

2
src/test/ui/infinite/infinite-tag-type-recursion.stderr
View file

@ -18,7 +18,7 @@ LL | enum MList { Cons(isize, MList), Nil }
| ^^^^^^^^^^
|
= note: ...which immediately requires computing drop-check constraints for `MList` again
= note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing }, value: MList } }`
= note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing, constness: NotConst }, value: MList } }`
error: aborting due to 2 previous errors

1
src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs
View file

@ -1,6 +1,5 @@
// FIXME(fee1-dead): this should have a better error message
#![feature(const_trait_impl)]
struct NonConstAdd(i32);
impl std::ops::Add for NonConstAdd {

4
src/test/ui/rfc-2632-const-trait-impl/assoc-type.stderr
View file

@ -1,12 +1,12 @@
error[E0277]: cannot add `NonConstAdd` to `NonConstAdd`
--> $DIR/assoc-type.rs:19:16
--> $DIR/assoc-type.rs:18:16
|
LL | type Bar = NonConstAdd;
| ^^^^^^^^^^^ no implementation for `NonConstAdd + NonConstAdd`
|
= help: the trait `Add` is not implemented for `NonConstAdd`
note: required by a bound in `Foo::Bar`
--> $DIR/assoc-type.rs:15:15
--> $DIR/assoc-type.rs:14:15
|
LL | type Bar: ~const std::ops::Add;
| ^^^^^^^^^^^^^^^^^^^^ required by this bound in `Foo::Bar`