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

Auto merge of #88176 - erikdesjardins:rezst, r=oli-obk

Browse source 
Reenable RemoveZsts

Now that the underlying issue has been fixed by #88124, we can reland #83417.

r? `@oli-obk`
This commit is contained in:
bors 2021-08-20 16:25:34 +00:00
commit 914a1e2c51
13 changed files with 22 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/consts/const-eval/panic-assoc-never-type.rs
View file

@ -14,5 +14,4 @@ impl PrintName {
fn main() {
let _ = PrintName::VOID;
//~^ ERROR erroneous constant used
}

8
src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
View file

@ -6,12 +6,6 @@ LL | const VOID: ! = panic!();
|
= note: this error originates in the macro `$crate::panic::panic_2015` (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0080]: erroneous constant used
--> $DIR/panic-assoc-never-type.rs:16:13
|
LL | let _ = PrintName::VOID;
| ^^^^^^^^^^^^^^^ referenced constant has errors
error: aborting due to 2 previous errors
error: aborting due to previous error
For more information about this error, try `rustc --explain E0080`.

6
src/test/ui/recursion/issue-26548-recursion-via-normalize.stderr
View file

@ -1,7 +1,7 @@
error[E0391]: cycle detected when computing layout of `S`
error[E0391]: cycle detected when computing layout of `std::option::Option<S>`
|
= note: ...which requires computing layout of `std::option::Option<S>`...
= note: ...which again requires computing layout of `S`, completing the cycle
= note: ...which requires computing layout of `S`...
= note: ...which again requires computing layout of `std::option::Option<S>`, completing the cycle
note: cycle used when optimizing MIR for `main`
--> $DIR/issue-26548-recursion-via-normalize.rs:15:1
|