diff options
| author | bors <bors@rust-lang.org> | 2016-01-07 21:04:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-07 21:04:36 +0000 |
| commit | 5c92010d3bf51bd83e2fdab4374b506a1d112fd2 (patch) | |
| tree | d9612166f606164e2ffe82051317b2d8289dae2e /src | |
| parent | 25d1f4bc21a2ab77e12ebcd8c5fb479b563d3bf7 (diff) | |
| parent | b7fa37d03e39dbf4120c136c84f388d357a74779 (diff) | |
| download | rust-5c92010d3bf51bd83e2fdab4374b506a1d112fd2.tar.gz rust-5c92010d3bf51bd83e2fdab4374b506a1d112fd2.zip | |
Auto merge of #30748 - tsion:mir-tuple-fix, r=eddyb
r? @nikomatsakis
(Related issue about `debug_tuple` at https://github.com/rust-lang/rfcs/issues/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);
}
}
```
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/mir/repr.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs index 1572040e234..a3fb1fc87c5 100644 --- a/src/librustc/mir/repr.rs +++ b/src/librustc/mir/repr.rs @@ -803,10 +803,10 @@ impl<'tcx> Debug for Rvalue<'tcx> { Vec => write!(fmt, "{:?}", lvs), Tuple => { - if lvs.len() == 1 { - write!(fmt, "({:?},)", lvs[0]) - } else { - fmt_tuple(fmt, "", lvs) + match lvs.len() { + 0 => write!(fmt, "()"), + 1 => write!(fmt, "({:?},)", lvs[0]), + _ => fmt_tuple(fmt, "", lvs), } } |
