Skip to content

Commit 5c92010

Browse files
committed
Auto merge of #30748 - tsion:mir-tuple-fix, r=eddyb
r? @nikomatsakis (Related issue about `debug_tuple` at rust-lang/rfcs#1448.) ```rust fn main() { let _x = (); } ``` ```diff --- empty_tuple-old.mir 2016-01-06 16:04:24.206409186 -0600 +++ empty_tuple-new.mir 2016-01-06 14:26:17.324888585 -0600 @@ -1,13 +1,13 @@ fn() -> () { let var0: (); // _x let mut tmp0: (); bb0: { - var0 = ; + var0 = (); Some(goto -> bb1); } bb1: { Some(return); } } ```
2 parents 25d1f4b + b7fa37d commit 5c92010

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/librustc/mir/repr.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -803,10 +803,10 @@ impl<'tcx> Debug for Rvalue<'tcx> {
803803
Vec => write!(fmt, "{:?}", lvs),
804804

805805
Tuple => {
806-
if lvs.len() == 1 {
807-
write!(fmt, "({:?},)", lvs[0])
808-
} else {
809-
fmt_tuple(fmt, "", lvs)
806+
match lvs.len() {
807+
0 => write!(fmt, "()"),
808+
1 => write!(fmt, "({:?},)", lvs[0]),
809+
_ => fmt_tuple(fmt, "", lvs),
810810
}
811811
}
812812

0 commit comments

Comments
 (0)