From 6c9c6a721705a74f7193932c50637be10ddeb49c Mon Sep 17 00:00:00 2001 From: Mohammad Fawaz Date: Tue, 9 Apr 2024 10:08:37 -0400 Subject: [PATCH] Fix one more clippy issue and add back some code I thought was dead --- src/lib.rs | 1 + src/write.rs | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 39eb602..a887c5e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -530,6 +530,7 @@ impl Default for Config { #[test] #[should_panic] +#[allow(clippy::reversed_empty_ranges)] fn backwards_label_should_panic() { Label::new(1..0); } diff --git a/src/write.rs b/src/write.rs index 166559d..11ca399 100644 --- a/src/write.rs +++ b/src/write.rs @@ -723,7 +723,20 @@ impl Report<'_, S> { let underline = get_underline(col).filter(|_| row == 0); let [c, tail] = if let Some(vbar_ll) = vbar { let [c, tail] = if underline.is_some() { - [draw.underbar, draw.underline] + // TODO: Is this good? + // The `true` is used here because it's temporarily disabling a + // feature that might be reenabled later. + #[allow(clippy::overly_complex_bool_expr)] + if ExactSizeIterator::len(&vbar_ll.label.char_span) <= 1 || true + { + [draw.underbar, draw.underline] + } else if line.offset() + col == vbar_ll.label.char_span.start { + [draw.ltop, draw.underbar] + } else if line.offset() + col == vbar_ll.label.last_offset() { + [draw.rtop, draw.underbar] + } else { + [draw.underbar, draw.underline] + } } else if vbar_ll.multi && row == 0 && self.config.multiline_arrows { [draw.uarrow, ' ']