From 27fe1c380b481304a75411ac96cac52d5a8f6c2c Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Fri, 22 Sep 2023 17:59:52 +0000
Subject: [PATCH] Fix debug printing of tuple
---
compiler/rustc_type_ir/src/sty.rs | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/compiler/rustc_type_ir/src/sty.rs b/compiler/rustc_type_ir/src/sty.rs
index b574cdcc879a1..380d70589bc1f 100644
--- a/compiler/rustc_type_ir/src/sty.rs
+++ b/compiler/rustc_type_ir/src/sty.rs
@@ -564,22 +564,18 @@ impl<I: Interner> DebugWithInfcx<I> for TyKind<I> {
}
Never => write!(f, "!"),
Tuple(t) => {
- let mut iter = t.clone().into_iter();
-
write!(f, "(")?;
-
- match iter.next() {
- None => return write!(f, ")"),
- Some(ty) => write!(f, "{:?}", &this.wrap(ty))?,
- };
-
- match iter.next() {
- None => return write!(f, ",)"),
- Some(ty) => write!(f, "{:?})", &this.wrap(ty))?,
+ let mut count = 0;
+ for ty in t.clone() {
+ if count > 0 {
+ write!(f, ", ")?;
+ }
+ write!(f, "{:?}", &this.wrap(ty))?;
+ count += 1;
}
-
- for ty in iter {
- write!(f, ", {:?}", &this.wrap(ty))?;
+ // unary tuples need a trailing comma
+ if count == 1 {
+ write!(f, ",")?;
}
write!(f, ")")
}