Filter empty lines, comments and delimiters from previous to last multiline span rendering

estebank · estebank · commit cc9d9ccd11e9 · 2024-12-12T23:36:27.000Z
diff --git a/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr b/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr
@@ -20,7 +20,6 @@ LL | |     fn clone_self(&self) -> Self {
 LL | |         Self {
 LL | |             a: true,
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -32,7 +31,6 @@ LL | |     fn default() -> Self {
 LL | |         Self {
 LL | |             a: true,
 ...  |
-LL | |     }
 LL | | }
    | |_^
 
diff --git a/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr b/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr
@@ -286,7 +286,6 @@ LL | |         if unsafe { true } {
 LL | |             todo!();
 LL | |         } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
diff --git a/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr b/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr
@@ -294,7 +294,6 @@ LL | |         if unsafe { true } {
 LL | |             todo!();
 LL | |         } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
diff --git a/tests/ui/bind_instead_of_map_multipart.stderr b/tests/ui/bind_instead_of_map_multipart.stderr
@@ -44,7 +44,6 @@ LL | |         if {
 LL | |             if s == "43" {
 LL | |                 return Some(43);
 ...  |
-LL | |         }
 LL | |     });
    | |______^
    |
diff --git a/tests/ui/collapsible_else_if.stderr b/tests/ui/collapsible_else_if.stderr
@@ -44,7 +44,6 @@ LL |       } else {
 LL | |         if y == "world" {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -66,7 +65,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -88,7 +86,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -110,7 +107,6 @@ LL |       } else {
 LL | |         if x == "hello" {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -132,7 +128,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
diff --git a/tests/ui/copy_iterator.stderr b/tests/ui/copy_iterator.stderr
@@ -6,7 +6,6 @@ LL | |
 LL | |
 LL | |     type Item = u8;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
diff --git a/tests/ui/crashes/ice-360.stderr b/tests/ui/crashes/ice-360.stderr
@@ -3,7 +3,6 @@ error: this loop never actually loops
    |
 LL | /     loop {
 ...  |
-LL | |
 LL | |     }
    | |_____^
    |
@@ -14,7 +13,6 @@ error: this loop could be written as a `while let` loop
    |
 LL | /     loop {
 ...  |
-LL | |
 LL | |     }
    | |_____^ help: try: `while let Some(ele) = iter.next() { .. }`
    |
diff --git a/tests/ui/derivable_impls.stderr b/tests/ui/derivable_impls.stderr
@@ -6,7 +6,6 @@ LL | |     fn default() -> Self {
 LL | |         Self {
 LL | |             a: false,
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
diff --git a/tests/ui/empty_line_after/doc_comments.stderr b/tests/ui/empty_line_after/doc_comments.stderr
@@ -97,7 +97,6 @@ error: empty lines after doc comment
    |
 LL | /     /// for OldA
 ...  |
-LL | |     // struct OldB;
 LL | |
    | |_^
 ...
diff --git a/tests/ui/entry.stderr b/tests/ui/entry.stderr
@@ -16,8 +16,7 @@ LL | /     if !m.contains_key(&k) {
 LL | |         if true {
 LL | |             m.insert(k, v);
 LL | |         } else {
-LL | |             m.insert(k, v2);
-LL | |         }
+...  |
 LL | |     }
    | |_____^
    |
@@ -63,7 +62,6 @@ LL | |         if true {
 LL | |             m.insert(k, v);
 LL | |         } else {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -154,7 +152,6 @@ LL | |         foo();
 LL | |         match 0 {
 LL | |             0 if false => {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
diff --git a/tests/ui/enum_variants.stderr b/tests/ui/enum_variants.stderr
@@ -45,7 +45,6 @@ LL | / enum Food {
 LL | |
 LL | |     FoodGood,
 ...  |
-LL | |
 LL | | }
    | |_^
    |
diff --git a/tests/ui/fallible_impl_from.stderr b/tests/ui/fallible_impl_from.stderr
@@ -29,7 +29,6 @@ LL | |
 LL | |     fn from(i: usize) -> Invalid {
 LL | |         if i != 42 {
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -49,7 +48,6 @@ LL | |
 LL | |     fn from(s: Option<String>) -> Invalid {
 LL | |         let s = s.unwrap();
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -76,7 +74,6 @@ LL | |
 LL | |     fn from(s: &'a mut <Box<u32> as ProjStrTrait>::ProjString) -> Invalid {
 LL | |         if s.parse::<u32>().ok().unwrap() != 42 {
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
diff --git a/tests/ui/if_same_then_else2.stderr b/tests/ui/if_same_then_else2.stderr
@@ -7,7 +7,6 @@ LL | |         for _ in &[42] {
 LL | |             let foo: &Option<_> = &Some::<u8>(42);
 LL | |             if foo.is_some() {
 ...  |
-LL | |         }
 LL | |     } else {
    | |_____^
    |
@@ -20,7 +19,6 @@ LL | |         for _ in &[42] {
 LL | |             let bar: &Option<_> = &Some::<u8>(42);
 LL | |             if bar.is_some() {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    = note: `-D clippy::if-same-then-else` implied by `-D warnings`
diff --git a/tests/ui/infinite_loops.stderr b/tests/ui/infinite_loops.stderr
@@ -37,7 +37,6 @@ LL | /         loop {
 LL | |
 LL | |             loop {
 ...  |
-LL | |             }
 LL | |         }
    | |_________^
    |
@@ -94,7 +93,6 @@ LL | |
 LL | |         loop {
 LL | |             if cond {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -111,7 +109,6 @@ LL | |
 LL | |         'inner: loop {
 LL | |             loop {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -142,7 +139,6 @@ LL | |
 LL | |             'inner: loop {
 LL | |                 loop {
 ...  |
-LL | |             }
 LL | |         }
    | |_________^
    |
@@ -159,7 +155,6 @@ LL | |
 LL | |         match opt {
 LL | |             Some(v) => {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -276,7 +271,6 @@ LL | |
 LL | |         'inner: loop {
 LL | |             loop {
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
diff --git a/tests/ui/into_iter_without_iter.stderr b/tests/ui/into_iter_without_iter.stderr
@@ -6,7 +6,6 @@ LL | |
 LL | |     type IntoIter = std::slice::Iter<'a, u8>;
 LL | |     type Item = &'a u8;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -30,7 +29,6 @@ LL | |
 LL | |     type IntoIter = std::slice::IterMut<'a, u8>;
 LL | |     type Item = &'a mut u8;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -52,7 +50,6 @@ LL | |
 LL | |     type IntoIter = std::slice::Iter<'a, T>;
 LL | |     type Item = &'a T;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -74,7 +71,6 @@ LL | |
 LL | |     type IntoIter = std::slice::IterMut<'a, T>;
 LL | |     type Item = &'a mut T;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -96,7 +92,6 @@ LL | |
 LL | |     type IntoIter = std::slice::IterMut<'a, T>;
 LL | |     type Item = &'a mut T;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -117,8 +112,7 @@ LL | /         impl<'a> IntoIterator for &'a Issue12037 {
 LL | |             type IntoIter = std::slice::Iter<'a, u8>;
 LL | |             type Item = &'a u8;
 LL | |             fn into_iter(self) -> Self::IntoIter {
-LL | |                 todo!()
-LL | |             }
+...  |
 LL | |         }
    | |_________^
 ...
diff --git a/tests/ui/manual_find.stderr b/tests/ui/manual_find.stderr
@@ -6,7 +6,6 @@ LL | |
 LL | |
 LL | |         if s == String::new() {
 ...  |
-LL | |     }
 LL | |     None
    | |________^ help: replace with an iterator: `strings.into_iter().find(|s| s == String::new())`
    |
@@ -22,7 +21,6 @@ LL | |
 LL | |
 LL | |         if s == String::new() {
 ...  |
-LL | |     }
 LL | |     None
    | |________^ help: replace with an iterator: `arr.into_iter().map(|(s, _)| s).find(|s| s == String::new())`
    |
diff --git a/tests/ui/manual_flatten.stderr b/tests/ui/manual_flatten.stderr
@@ -184,7 +184,6 @@ LL | |
 LL | |         Some(1),
 LL | |         Some(2),
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
diff --git a/tests/ui/manual_let_else.stderr b/tests/ui/manual_let_else.stderr
@@ -148,7 +148,6 @@ LL | |
 LL | |         v_some
 LL | |     } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
@@ -175,7 +174,6 @@ LL | |
 LL | |         v_some
 LL | |     } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
@@ -197,7 +195,6 @@ LL | |
 LL | |         v_some
 LL | |     } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
@@ -306,7 +303,6 @@ LL | |
 LL | |         v_some
 LL | |     } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |
diff --git a/tests/ui/manual_unwrap_or.stderr b/tests/ui/manual_unwrap_or.stderr
@@ -36,7 +36,6 @@ LL | |         Some(i) => i,
 LL | |         None => {
 LL | |             42 + 42
 ...  |
-LL | |         }
 LL | |     };
    | |_____^
    |
@@ -130,7 +129,6 @@ LL | |         Ok(i) => i,
 LL | |         Err(_) => {
 LL | |             42 + 42
 ...  |
-LL | |         }
 LL | |     };
    | |_____^
    |
diff --git a/tests/ui/missing_doc.stderr b/tests/ui/missing_doc.stderr
@@ -72,7 +72,6 @@ LL | |     /// dox
 LL | |     pub fn documented() {}
 LL | |     pub fn undocumented1() {}
 ...  |
-LL | |     }
 LL | | }
    | |_^
 
diff --git a/tests/ui/missing_fields_in_debug.stderr b/tests/ui/missing_fields_in_debug.stderr
@@ -6,7 +6,6 @@ LL | |
 LL | |     // unused field: hidden
 LL | |     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -28,7 +27,6 @@ LL | |
 LL | |     // unused fields: hidden, hidden2, hidden4
 LL | |     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -58,7 +56,6 @@ LL | |
 LL | |     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
 LL | |         let mut f = formatter.debug_struct("MultiExprDebugImpl");
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
diff --git a/tests/ui/needless_for_each_unfixable.stderr b/tests/ui/needless_for_each_unfixable.stderr
diff --git a/tests/ui/never_loop.stderr b/tests/ui/never_loop.stderr
diff --git a/tests/ui/single_match_else.stderr b/tests/ui/single_match_else.stderr
diff --git a/tests/ui/unit_cmp.stderr b/tests/ui/unit_cmp.stderr
diff --git a/tests/ui/unnecessary_lazy_eval.stderr b/tests/ui/unnecessary_lazy_eval.stderr
diff --git a/tests/ui/unnecessary_wraps.stderr b/tests/ui/unnecessary_wraps.stderr
diff --git a/tests/ui/unwrap_in_result.stderr b/tests/ui/unwrap_in_result.stderr
diff --git a/tests/ui/while_let_loop.stderr b/tests/ui/while_let_loop.stderr

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ LL \| \| if unsafe { true } {`
`286`	`286`	`LL \| \| todo!();`
`287`	`287`	`LL \| \| } else {`
`288`	`288`	`... \|`
`289`		`-LL \| \| }`
`290`	`289`	`LL \| \| };`
`291`	`290`	`\| \|______^`
`292`	`291`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,6 @@ LL \| \| if unsafe { true } {`
`294`	`294`	`LL \| \| todo!();`
`295`	`295`	`LL \| \| } else {`
`296`	`296`	`... \|`
`297`		`-LL \| \| }`
`298`	`297`	`LL \| \| };`
`299`	`298`	`\| \|______^`
`300`	`299`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ LL \| \| if {`
`44`	`44`	`LL \| \| if s == "43" {`
`45`	`45`	`LL \| \| return Some(43);`
`46`	`46`	`... \|`
`47`		`-LL \| \| }`
`48`	`47`	`LL \| \| });`
`49`	`48`	`\| \|______^`
`50`	`49`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| \|`
`6`	`6`	`LL \| \|`
`7`	`7`	`LL \| \| type Item = u8;`
`8`	`8`	`... \|`
`9`		`-LL \| \| }`
`10`	`9`	`LL \| \| }`
`11`	`10`	`\| \|_^`
`12`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ error: this loop never actually loops`
`3`	`3`	`\|`
`4`	`4`	`LL \| / loop {`
`5`	`5`	`... \|`
`6`		`-LL \| \|`
`7`	`6`	`LL \| \| }`
`8`	`7`	`\| \|_____^`
`9`	`8`	`\|`
@@ -14,7 +13,6 @@ error: this loop could be written as a `while let` loop
`14`	`13`	`\|`
`15`	`14`	`LL \| / loop {`
`16`	`15`	`... \|`
`17`		`-LL \| \|`
`18`	`16`	`LL \| \| }`
`19`	`17`	\| \|_____^ help: try: `while let Some(ele) = iter.next() { .. }`
`20`	`18`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ LL \| \| fn default() -> Self {`
`6`	`6`	`LL \| \| Self {`
`7`	`7`	`LL \| \| a: false,`
`8`	`8`	`... \|`
`9`		`-LL \| \| }`
`10`	`9`	`LL \| \| }`
`11`	`10`	`\| \|_^`
`12`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ error: empty lines after doc comment`
`97`	`97`	`\|`
`98`	`98`	`LL \| / /// for OldA`
`99`	`99`	`... \|`
`100`		`-LL \| \| // struct OldB;`
`101`	`100`	`LL \| \|`
`102`	`101`	`\| \|_^`
`103`	`102`	`...`