64ea8eb1a9
The `Debug` impl for `Ty` just calls the `Display` impl for `Ty`. This is surprising and annoying. In particular, it means `Debug` doesn't show as much information as `Debug` for `TyKind` does. And `Debug` is used in some user-facing error messages, which seems bad. This commit changes the `Debug` impl for `Ty` to call the `Debug` impl for `TyKind`. It also does a number of follow-up changes to preserve existing output, many of which involve inserting `with_no_trimmed_paths!` calls. It also adds `Display` impls for `UserType` and `Canonical`. Some tests have changes to expected output: - Those that use the `rustc_abi(debug)` attribute. - Those that use the `EMIT_MIR` annotation. In each case the output is slightly uglier than before. This isn't ideal, but it's pretty weird (particularly for the attribute) that the output is using `Debug` in the first place. They're fairly obscure attributes (I hadn't heard of them) so I'm not worried by this. For `async-is-unwindsafe.stderr`, there is one line that now lacks a full path. This is a consistency improvement, because all the other mentions of `Context` in this test lack a path.
96 lines
1.7 KiB
Rust
96 lines
1.7 KiB
Rust
// MIR for `main::{closure#0}` 0 generator_drop
|
|
/* generator_layout = GeneratorLayout {
|
|
field_tys: {
|
|
_0: GeneratorSavedTy {
|
|
ty: Adt(
|
|
std::string::String,
|
|
[
|
|
],
|
|
),
|
|
source_info: SourceInfo {
|
|
span: $DIR/generator_drop_cleanup.rs:11:13: 11:15 (#0),
|
|
scope: scope[0],
|
|
},
|
|
ignore_for_traits: false,
|
|
},
|
|
},
|
|
variant_fields: {
|
|
Unresumed(0): [],
|
|
Returned (1): [],
|
|
Panicked (2): [],
|
|
Suspend0 (3): [_0],
|
|
},
|
|
storage_conflicts: BitMatrix(1x1) {
|
|
(_0, _0),
|
|
},
|
|
} */
|
|
|
|
fn main::{closure#0}(_1: *mut [generator@$DIR/generator_drop_cleanup.rs:10:15: 10:17]) -> () {
|
|
let mut _0: ();
|
|
let mut _2: ();
|
|
let _3: std::string::String;
|
|
let _4: ();
|
|
let mut _5: ();
|
|
let mut _6: ();
|
|
let mut _7: ();
|
|
let mut _8: u32;
|
|
scope 1 {
|
|
debug _s => (((*_1) as variant#3).0: std::string::String);
|
|
}
|
|
|
|
bb0: {
|
|
_8 = discriminant((*_1));
|
|
switchInt(move _8) -> [0: bb7, 3: bb10, otherwise: bb11];
|
|
}
|
|
|
|
bb1: {
|
|
StorageDead(_5);
|
|
StorageDead(_4);
|
|
drop((((*_1) as variant#3).0: std::string::String)) -> [return: bb2, unwind: bb5];
|
|
}
|
|
|
|
bb2: {
|
|
nop;
|
|
goto -> bb8;
|
|
}
|
|
|
|
bb3: {
|
|
return;
|
|
}
|
|
|
|
bb4 (cleanup): {
|
|
resume;
|
|
}
|
|
|
|
bb5 (cleanup): {
|
|
nop;
|
|
goto -> bb4;
|
|
}
|
|
|
|
bb6: {
|
|
return;
|
|
}
|
|
|
|
bb7: {
|
|
goto -> bb9;
|
|
}
|
|
|
|
bb8: {
|
|
goto -> bb3;
|
|
}
|
|
|
|
bb9: {
|
|
goto -> bb6;
|
|
}
|
|
|
|
bb10: {
|
|
StorageLive(_4);
|
|
StorageLive(_5);
|
|
goto -> bb1;
|
|
}
|
|
|
|
bb11: {
|
|
return;
|
|
}
|
|
}
|