mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 15:23:46 +00:00
c9c80d2c5f
The only non-obvious changes: - `building/storage_live_dead_in_statics.rs` has a `#[rustfmt::skip]` attribute to avoid reformating a table of data. - Two `.mir` files have slight changes involving line numbers. - In `unusual_item_types.rs` an `EMIT_MIR` annotation is moved to outside a function, which is the usual spot, because `tidy` complains if such a comment is indented. The commit also tweaks the comments in `rustfmt.toml`.
36 lines
870 B
Rust
36 lines
870 B
Rust
// skip-filecheck
|
|
//@ compile-flags: -O -C debuginfo=0 -Zmir-opt-level=2
|
|
|
|
// Track the status of MIR optimizations simplifying `Ok(res?)` for both the old and new desugarings
|
|
// of that syntax.
|
|
|
|
use std::ops::ControlFlow;
|
|
|
|
// EMIT_MIR try_identity.new.PreCodegen.after.mir
|
|
fn new<T, E>(x: Result<T, E>) -> Result<T, E> {
|
|
Ok(
|
|
match {
|
|
match x {
|
|
Ok(v) => ControlFlow::Continue(v),
|
|
Err(e) => ControlFlow::Break(e),
|
|
}
|
|
} {
|
|
ControlFlow::Continue(v) => v,
|
|
ControlFlow::Break(e) => return Err(e),
|
|
},
|
|
)
|
|
}
|
|
|
|
// EMIT_MIR try_identity.old.PreCodegen.after.mir
|
|
fn old<T, E>(x: Result<T, E>) -> Result<T, E> {
|
|
Ok(match x {
|
|
Ok(v) => v,
|
|
Err(e) => return Err(e),
|
|
})
|
|
}
|
|
|
|
fn main() {
|
|
let _ = new::<(), ()>(Ok(()));
|
|
let _ = old::<(), ()>(Ok(()));
|
|
}
|