Skip to content

Commit 84f2854

Browse files
committed
remove fixme & update stderr files
1 parent a47c8b2 commit 84f2854

File tree

10 files changed

+0
-29
lines changed

10 files changed

+0
-29
lines changed

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -303,17 +303,6 @@ impl AnnotateSnippetEmitter {
303303
}
304304
}
305305

306-
let suggestions_expected = suggestions
307-
.iter()
308-
.filter(|s| {
309-
matches!(
310-
s.style,
311-
SuggestionStyle::HideCodeInline
312-
| SuggestionStyle::ShowCode
313-
| SuggestionStyle::ShowAlways
314-
)
315-
})
316-
.count();
317306
for suggestion in suggestions {
318307
match suggestion.style {
319308
SuggestionStyle::CompletelyHidden => {
@@ -526,12 +515,6 @@ impl AnnotateSnippetEmitter {
526515
}
527516
}
528517

529-
// FIXME: This hack should be removed once annotate_snippets is the
530-
// default emitter.
531-
if suggestions_expected > 0 && report.is_empty() {
532-
group = group.element(Padding);
533-
}
534-
535518
if !group.is_empty() {
536519
report.push(group);
537520
}

src/tools/clippy/tests/ui/unit_arg.stderr

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,21 +204,18 @@ error: passing a unit value to a function
204204
|
205205
LL | fn_take_unit(mac!(def));
206206
| ^^^^^^^^^^^^^^^^^^^^^^^
207-
|
208207

209208
error: passing a unit value to a function
210209
--> tests/ui/unit_arg.rs:173:5
211210
|
212211
LL | fn_take_unit(mac!(func Default::default));
213212
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
214-
|
215213

216214
error: passing a unit value to a function
217215
--> tests/ui/unit_arg.rs:175:5
218216
|
219217
LL | fn_take_unit(mac!(nonempty_block Default::default()));
220218
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
221-
|
222219

223220
error: aborting due to 13 previous errors
224221

tests/ui/attributes/crate-type-delimited.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | #![crate_type(lib)]
55
| ^^^^^^^^^^^^^^^^^^^
66
|
77
= note: for more information, visit <https://doc.rust-lang.org/reference/linkage.html>
8-
|
98

109
error: aborting due to 1 previous error
1110

tests/ui/attributes/crate-type-empty.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | #![crate_type]
55
| ^^^^^^^^^^^^^^
66
|
77
= note: for more information, visit <https://doc.rust-lang.org/reference/linkage.html>
8-
|
98

109
error: aborting due to 1 previous error
1110

tests/ui/attributes/crate-type-macro-call.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | #![crate_type = foo!()]
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: for more information, visit <https://doc.rust-lang.org/reference/linkage.html>
8-
|
98

109
error: aborting due to 1 previous error
1110

tests/ui/const-generics/generic_const_exprs/issue-105608.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ error[E0282]: type annotations needed
33
|
44
LL | Combination::<0>.and::<_>().and::<_>();
55
| ^^^ cannot infer type of the type parameter `M` declared on the method `and`
6-
|
76

87
error: aborting due to 1 previous error
98

tests/ui/delegation/ice-line-bounds-issue-148732.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LL | dbg!(b);
55
| ^^^^^^^ expected named lifetime parameter
66
|
77
= note: this error originates in the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
8-
|
98

109
error[E0425]: cannot find function `a` in this scope
1110
--> $DIR/ice-line-bounds-issue-148732.rs:1:7

tests/ui/macros/cfg_select.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,12 @@ error[E0539]: malformed `cfg_select` macro input
3838
|
3939
LL | "str" => {}
4040
| ^^^^^ expected a valid identifier here
41-
|
4241

4342
error[E0539]: malformed `cfg_select` macro input
4443
--> $DIR/cfg_select.rs:80:5
4544
|
4645
LL | a::b => {}
4746
| ^^^^ expected a valid identifier here
48-
|
4947

5048
error[E0537]: invalid predicate `a`
5149
--> $DIR/cfg_select.rs:85:5

tests/ui/span/issue-42234-unknown-receiver-type.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ error[E0282]: type annotations needed
1616
|
1717
LL | .sum::<_>()
1818
| ^^^ cannot infer type of the type parameter `S` declared on the method `sum`
19-
|
2019

2120
error: aborting due to 2 previous errors
2221

tests/ui/structs/ice-line-bounds-issue-148684.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ LL | | }
99
...
1010
LL | A(2, vec![])
1111
| ^^^^^^^^^^^^
12-
|
1312

1413
error: aborting due to 1 previous error
1514

0 commit comments

Comments
 (0)