Skip to content

Commit 49a22a4

Browse files
estebankestebank
committed
Filter empty lines, comments and delimiters from previous to last multiline span rendering
1 parent 65a54a7 commit 49a22a4

File tree

103 files changed

+115
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+115
-401
lines changed

‎compiler/rustc_errors/src/emitter.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -3064,7 +3064,11 @@ impl FileWithAnnotatedLines {
30643064
add_annotation_to_file(&mut output, Lrc::clone(&file), line, ann.as_line());
30653065
}
30663066
let line_end = ann.line_end - 1;
3067-
if middle < line_end {
3067+
let end_is_empty = file.get_line(line_end - 1).map_or(false, |s| {
3068+
let s = s.trim();
3069+
["", "{", "}", "(", ")", "[", "]"].contains(&s) || s.starts_with("//")
3070+
});
3071+
if middle < line_end && !end_is_empty {
30683072
add_annotation_to_file(&mut output, Lrc::clone(&file), line_end, ann.as_line());
30693073
}
30703074
} else {

‎src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ LL | | fn clone_self(&self) -> Self {
2020
LL | | Self {
2121
LL | | a: true,
2222
... |
23-
LL | | }
2423
LL | | }
2524
| |_^
2625
|
@@ -32,7 +31,6 @@ LL | | fn default() -> Self {
3231
LL | | Self {
3332
LL | | a: true,
3433
... |
35-
LL | | }
3634
LL | | }
3735
| |_^
3836

‎src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ LL | | if unsafe { true } {
286286
LL | | todo!();
287287
LL | | } else {
288288
... |
289-
LL | | }
290289
LL | | };
291290
| |______^
292291
|

‎src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ LL | | if unsafe { true } {
294294
LL | | todo!();
295295
LL | | } else {
296296
... |
297-
LL | | }
298297
LL | | };
299298
| |______^
300299
|

‎src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ LL | | if {
4444
LL | | if s == "43" {
4545
LL | | return Some(43);
4646
... |
47-
LL | | }
4847
LL | | });
4948
| |______^
5049
|

‎src/tools/clippy/tests/ui/collapsible_else_if.stderr

-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ LL | } else {
4444
LL | | if y == "world" {
4545
LL | | println!("world")
4646
... |
47-
LL | | }
4847
LL | | }
4948
| |_____^
5049
|
@@ -66,7 +65,6 @@ LL | } else {
6665
LL | | if let Some(42) = Some(42) {
6766
LL | | println!("world")
6867
... |
69-
LL | | }
7068
LL | | }
7169
| |_____^
7270
|
@@ -88,7 +86,6 @@ LL | } else {
8886
LL | | if let Some(42) = Some(42) {
8987
LL | | println!("world")
9088
... |
91-
LL | | }
9289
LL | | }
9390
| |_____^
9491
|
@@ -110,7 +107,6 @@ LL | } else {
110107
LL | | if x == "hello" {
111108
LL | | println!("world")
112109
... |
113-
LL | | }
114110
LL | | }
115111
| |_____^
116112
|
@@ -132,7 +128,6 @@ LL | } else {
132128
LL | | if let Some(42) = Some(42) {
133129
LL | | println!("world")
134130
... |
135-
LL | | }
136131
LL | | }
137132
| |_____^
138133
|

‎src/tools/clippy/tests/ui/copy_iterator.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | |
66
LL | |
77
LL | | type Item = u8;
88
... |
9-
LL | | }
109
LL | | }
1110
| |_^
1211
|

‎src/tools/clippy/tests/ui/crashes/ice-360.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ error: this loop never actually loops
33
|
44
LL | / loop {
55
... |
6-
LL | |
76
LL | | }
87
| |_____^
98
|
@@ -14,7 +13,6 @@ error: this loop could be written as a `while let` loop
1413
|
1514
LL | / loop {
1615
... |
17-
LL | |
1816
LL | | }
1917
| |_____^ help: try: `while let Some(ele) = iter.next() { .. }`
2018
|

‎src/tools/clippy/tests/ui/derivable_impls.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | | fn default() -> Self {
66
LL | | Self {
77
LL | | a: false,
88
... |
9-
LL | | }
109
LL | | }
1110
| |_^
1211
|

‎src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ error: empty lines after doc comment
9797
|
9898
LL | / /// for OldA
9999
... |
100-
LL | | // struct OldB;
101100
LL | |
102101
| |_^
103102
...

‎src/tools/clippy/tests/ui/entry.stderr

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ LL | / if !m.contains_key(&k) {
1616
LL | | if true {
1717
LL | | m.insert(k, v);
1818
LL | | } else {
19-
LL | | m.insert(k, v2);
20-
LL | | }
19+
... |
2120
LL | | }
2221
| |_____^
2322
|
@@ -63,7 +62,6 @@ LL | | if true {
6362
LL | | m.insert(k, v);
6463
LL | | } else {
6564
... |
66-
LL | | }
6765
LL | | }
6866
| |_____^
6967
|
@@ -154,7 +152,6 @@ LL | | foo();
154152
LL | | match 0 {
155153
LL | | 0 if false => {
156154
... |
157-
LL | | }
158155
LL | | }
159156
| |_____^
160157
|

‎src/tools/clippy/tests/ui/enum_variants.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ LL | / enum Food {
4545
LL | |
4646
LL | | FoodGood,
4747
... |
48-
LL | |
4948
LL | | }
5049
| |_^
5150
|

‎src/tools/clippy/tests/ui/fallible_impl_from.stderr

-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ LL | |
2929
LL | | fn from(i: usize) -> Invalid {
3030
LL | | if i != 42 {
3131
... |
32-
LL | | }
3332
LL | | }
3433
| |_^
3534
|
@@ -49,7 +48,6 @@ LL | |
4948
LL | | fn from(s: Option<String>) -> Invalid {
5049
LL | | let s = s.unwrap();
5150
... |
52-
LL | | }
5351
LL | | }
5452
| |_^
5553
|
@@ -76,7 +74,6 @@ LL | |
7674
LL | | fn from(s: &'a mut <Box<u32> as ProjStrTrait>::ProjString) -> Invalid {
7775
LL | | if s.parse::<u32>().ok().unwrap() != 42 {
7876
... |
79-
LL | | }
8077
LL | | }
8178
| |_^
8279
|

‎src/tools/clippy/tests/ui/if_same_then_else2.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ LL | | for _ in &[42] {
77
LL | | let foo: &Option<_> = &Some::<u8>(42);
88
LL | | if foo.is_some() {
99
... |
10-
LL | | }
1110
LL | | } else {
1211
| |_____^
1312
|
@@ -20,7 +19,6 @@ LL | | for _ in &[42] {
2019
LL | | let bar: &Option<_> = &Some::<u8>(42);
2120
LL | | if bar.is_some() {
2221
... |
23-
LL | | }
2422
LL | | }
2523
| |_____^
2624
= note: `-D clippy::if-same-then-else` implied by `-D warnings`

‎src/tools/clippy/tests/ui/infinite_loops.stderr

-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ LL | / loop {
3737
LL | |
3838
LL | | loop {
3939
... |
40-
LL | | }
4140
LL | | }
4241
| |_________^
4342
|
@@ -94,7 +93,6 @@ LL | |
9493
LL | | loop {
9594
LL | | if cond {
9695
... |
97-
LL | | }
9896
LL | | }
9997
| |_____^
10098
|
@@ -111,7 +109,6 @@ LL | |
111109
LL | | 'inner: loop {
112110
LL | | loop {
113111
... |
114-
LL | | }
115112
LL | | }
116113
| |_____^
117114
|
@@ -142,7 +139,6 @@ LL | |
142139
LL | | 'inner: loop {
143140
LL | | loop {
144141
... |
145-
LL | | }
146142
LL | | }
147143
| |_________^
148144
|
@@ -159,7 +155,6 @@ LL | |
159155
LL | | match opt {
160156
LL | | Some(v) => {
161157
... |
162-
LL | | }
163158
LL | | }
164159
| |_____^
165160
|
@@ -276,7 +271,6 @@ LL | |
276271
LL | | 'inner: loop {
277272
LL | | loop {
278273
... |
279-
LL | | }
280274
LL | | }
281275
| |_____^
282276
|

‎src/tools/clippy/tests/ui/into_iter_without_iter.stderr

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | |
66
LL | | type IntoIter = std::slice::Iter<'a, u8>;
77
LL | | type Item = &'a u8;
88
... |
9-
LL | | }
109
LL | | }
1110
| |_^
1211
|
@@ -30,7 +29,6 @@ LL | |
3029
LL | | type IntoIter = std::slice::IterMut<'a, u8>;
3130
LL | | type Item = &'a mut u8;
3231
... |
33-
LL | | }
3432
LL | | }
3533
| |_^
3634
|
@@ -52,7 +50,6 @@ LL | |
5250
LL | | type IntoIter = std::slice::Iter<'a, T>;
5351
LL | | type Item = &'a T;
5452
... |
55-
LL | | }
5653
LL | | }
5754
| |_^
5855
|
@@ -74,7 +71,6 @@ LL | |
7471
LL | | type IntoIter = std::slice::IterMut<'a, T>;
7572
LL | | type Item = &'a mut T;
7673
... |
77-
LL | | }
7874
LL | | }
7975
| |_^
8076
|
@@ -96,7 +92,6 @@ LL | |
9692
LL | | type IntoIter = std::slice::IterMut<'a, T>;
9793
LL | | type Item = &'a mut T;
9894
... |
99-
LL | | }
10095
LL | | }
10196
| |_^
10297
|
@@ -117,8 +112,7 @@ LL | / impl<'a> IntoIterator for &'a Issue12037 {
117112
LL | | type IntoIter = std::slice::Iter<'a, u8>;
118113
LL | | type Item = &'a u8;
119114
LL | | fn into_iter(self) -> Self::IntoIter {
120-
LL | | todo!()
121-
LL | | }
115+
... |
122116
LL | | }
123117
| |_________^
124118
...

‎src/tools/clippy/tests/ui/manual_find.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | |
66
LL | |
77
LL | | if s == String::new() {
88
... |
9-
LL | | }
109
LL | | None
1110
| |________^ help: replace with an iterator: `strings.into_iter().find(|s| s == String::new())`
1211
|
@@ -22,7 +21,6 @@ LL | |
2221
LL | |
2322
LL | | if s == String::new() {
2423
... |
25-
LL | | }
2624
LL | | None
2725
| |________^ help: replace with an iterator: `arr.into_iter().map(|(s, _)| s).find(|s| s == String::new())`
2826
|

‎src/tools/clippy/tests/ui/manual_flatten.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ LL | |
184184
LL | | Some(1),
185185
LL | | Some(2),
186186
... |
187-
LL | | }
188187
LL | | }
189188
| |_____^
190189
|

‎src/tools/clippy/tests/ui/manual_let_else.stderr

-4
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ LL | |
148148
LL | | v_some
149149
LL | | } else {
150150
... |
151-
LL | | }
152151
LL | | };
153152
| |______^
154153
|
@@ -175,7 +174,6 @@ LL | |
175174
LL | | v_some
176175
LL | | } else {
177176
... |
178-
LL | | }
179177
LL | | };
180178
| |______^
181179
|
@@ -197,7 +195,6 @@ LL | |
197195
LL | | v_some
198196
LL | | } else {
199197
... |
200-
LL | | }
201198
LL | | };
202199
| |______^
203200
|
@@ -306,7 +303,6 @@ LL | |
306303
LL | | v_some
307304
LL | | } else {
308305
... |
309-
LL | | }
310306
LL | | };
311307
| |______^
312308
|

‎src/tools/clippy/tests/ui/manual_unwrap_or.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ LL | | Some(i) => i,
3636
LL | | None => {
3737
LL | | 42 + 42
3838
... |
39-
LL | | }
4039
LL | | };
4140
| |_____^
4241
|
@@ -130,7 +129,6 @@ LL | | Ok(i) => i,
130129
LL | | Err(_) => {
131130
LL | | 42 + 42
132131
... |
133-
LL | | }
134132
LL | | };
135133
| |_____^
136134
|

‎src/tools/clippy/tests/ui/missing_doc.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ LL | | /// dox
7272
LL | | pub fn documented() {}
7373
LL | | pub fn undocumented1() {}
7474
... |
75-
LL | | }
7675
LL | | }
7776
| |_^
7877

0 commit comments

Comments
 (0)