diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs
index b97d5939cf3b0..d90831c5dd1ec 100644
--- a/src/librustc/mir/repr.rs
+++ b/src/librustc/mir/repr.rs
@@ -804,10 +804,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),
                         }
                     }