Skip to content

Commit 7bb05db

Browse files
committed
Reduce the repetition in json error output
1 parent cf8600d commit 7bb05db

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

src/libsyntax/json.rs

+9-17
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,15 @@ impl Diagnostic {
153153
fn from_diagnostic_builder(db: &DiagnosticBuilder,
154154
je: &JsonEmitter)
155155
-> Diagnostic {
156-
let sugg = db.suggestions.iter().flat_map(|sugg| {
157-
je.render(sugg).into_iter().map(move |rendered| {
158-
Diagnostic {
159-
message: sugg.msg.clone(),
160-
code: None,
161-
level: "help",
162-
spans: DiagnosticSpan::from_suggestion(sugg, je),
163-
children: vec![],
164-
rendered: Some(rendered),
165-
}
166-
})
156+
let sugg = db.suggestions.iter().map(|sugg| {
157+
Diagnostic {
158+
message: sugg.msg.clone(),
159+
code: None,
160+
level: "help",
161+
spans: DiagnosticSpan::from_suggestion(sugg, je),
162+
children: vec![],
163+
rendered: None,
164+
}
167165
});
168166
Diagnostic {
169167
message: db.message(),
@@ -356,9 +354,3 @@ impl DiagnosticCode {
356354
})
357355
}
358356
}
359-
360-
impl JsonEmitter {
361-
fn render(&self, suggestion: &CodeSuggestion) -> Vec<String> {
362-
suggestion.splice_lines(&*self.cm).iter().map(|line| line.0.to_owned()).collect()
363-
}
364-
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"message":"unnecessary parentheses around assigned value","code":null,"level":"warning","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[{"message":"#[warn(unused_parens)] on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":"1 / (2 + 3)","expansion":null}],"children":[],"rendered":" let _a = 1 / (2 + 3);"}],"rendered":null}
1+
{"message":"unnecessary parentheses around assigned value","code":null,"level":"warning","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[{"message":"#[warn(unused_parens)] on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":976,"byte_end":989,"line_start":22,"line_end":22,"column_start":14,"column_end":27,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));","highlight_start":14,"highlight_end":27}],"label":null,"suggested_replacement":"1 / (2 + 3)","expansion":null}],"children":[],"rendered":null}],"rendered":null}

src/test/ui/lint/use_suggestion_json.stderr

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)