diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-01-25 08:39:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-25 08:39:45 +0100 |
| commit | a1ecced532ecffb288ca176cce56a8aa96f155ab (patch) | |
| tree | a71c5efff647eae177ddc1499b6c653cb5b22c7f /compiler/rustc_pattern_analysis/src/constructor.rs | |
| parent | b677c776865be82071d14d52aa5930ecd266f26d (diff) | |
| parent | 354b45f52854d4534aaf4bf860d539a9657a596f (diff) | |
| download | rust-a1ecced532ecffb288ca176cce56a8aa96f155ab.tar.gz rust-a1ecced532ecffb288ca176cce56a8aa96f155ab.zip | |
Rollup merge of #120318 - Nadrieril:share-debug-impl, r=compiler-errors
pattern_analysis: Reuse most of the `DeconstructedPat` `Debug` impl The `DeconstructedPat: Debug` is best-effort because we'd need `tcx` to get things like field names etc. Since rust-analyzer has a similar constraint, this PR moves most the impl to be shared between the two. While I was at it I also fixed a nit in the `IntRange: Debug` impl. r? `@compiler-errors`
Diffstat (limited to 'compiler/rustc_pattern_analysis/src/constructor.rs')
| -rw-r--r-- | compiler/rustc_pattern_analysis/src/constructor.rs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/compiler/rustc_pattern_analysis/src/constructor.rs b/compiler/rustc_pattern_analysis/src/constructor.rs index eba71a23435..e94a0373c79 100644 --- a/compiler/rustc_pattern_analysis/src/constructor.rs +++ b/compiler/rustc_pattern_analysis/src/constructor.rs @@ -391,12 +391,18 @@ impl IntRange { /// first. impl fmt::Debug for IntRange { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - if let Finite(lo) = self.lo { + if self.is_singleton() { + // Only finite ranges can be singletons. + let Finite(lo) = self.lo else { unreachable!() }; write!(f, "{lo}")?; - } - write!(f, "{}", RangeEnd::Excluded)?; - if let Finite(hi) = self.hi { - write!(f, "{hi}")?; + } else { + if let Finite(lo) = self.lo { + write!(f, "{lo}")?; + } + write!(f, "{}", RangeEnd::Excluded)?; + if let Finite(hi) = self.hi { + write!(f, "{hi}")?; + } } Ok(()) } |
