bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename some Diagnostic setters.

Browse source 
`Diagnostic` has 40 methods that return `&mut Self` and could be
considered setters. Four of them have a `set_` prefix. This doesn't seem
necessary for a type that implements the builder pattern. This commit
removes the `set_` prefixes on those four methods.
This commit is contained in:
Nicholas Nethercote 2023-12-24 09:08:41 +11:00
parent e51e98dde6
commit 505c1371d0
53 changed files with 274 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_parse/src/errors.rs
View file

@ -1065,8 +1065,8 @@ impl<'a> IntoDiagnostic<'a> for ExpectedIdentifier {
None => fluent::parse_expected_identifier_found_str,
},
);
diag.set_span(self.span);
diag.set_arg("token", self.token);
diag.span(self.span);
diag.arg("token", self.token);
if let Some(sugg) = self.suggest_raw {
sugg.add_to_diagnostic(&mut diag);
@ -1123,8 +1123,8 @@ impl<'a> IntoDiagnostic<'a> for ExpectedSemi {
None => fluent::parse_expected_semi_found_str,
},
);
diag.set_span(self.span);
diag.set_arg("token", self.token);
diag.span(self.span);
diag.arg("token", self.token);
if let Some(unexpected_token_label) = self.unexpected_token_label {
diag.span_label(unexpected_token_label, fluent::parse_label_unexpected_token);

2
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -252,7 +252,7 @@ impl<'a> StringReader<'a> {
if starts_with_number {
let span = self.mk_sp(start, self.pos);
let mut diag = self.dcx().struct_err("lifetimes cannot start with a number");
diag.set_span(span);
diag.span(span);
diag.stash(span, StashKey::LifetimeIsChar);
}
let ident = Symbol::intern(lifetime_name);

2
compiler/rustc_parse/src/lib.rs
View file

@ -154,7 +154,7 @@ fn try_file_to_source_file(
let msg = format!("couldn't read {}: {}", path.display(), e);
let mut diag = Diagnostic::new(Level::Fatal, msg);
if let Some(sp) = spanopt {
diag.set_span(sp);
diag.span(sp);
}
diag
})

2
compiler/rustc_parse/src/parser/attr.rs
View file

@ -174,7 +174,7 @@ impl<'a> Parser<'a> {
) {
Ok(Some(item)) => {
// FIXME(#100717)
err.set_arg("item", item.kind.descr());
err.arg("item", item.kind.descr());
err.span_label(item.span, fluent::parse_label_does_not_annotate_this);
err.span_suggestion_verbose(
replacement_span,

4
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -846,7 +846,7 @@ impl<'a> Parser<'a> {
) =>
{
let n_hashes: u8 = *n_hashes;
err.set_primary_message("too many `#` when terminating raw string");
err.primary_message("too many `#` when terminating raw string");
let str_span = self.prev_token.span;
let mut span = self.token.span;
let mut count = 0;
@ -857,7 +857,7 @@ impl<'a> Parser<'a> {
self.bump();
count += 1;
}
err.set_span(span);
err.span(span);
err.span_suggestion(
span,
format!("remove the extra `#`{}", pluralize!(count)),

7
compiler/rustc_parse/src/parser/mod.rs
View file

@ -925,9 +925,8 @@ impl<'a> Parser<'a> {
});
}
expect_err.set_primary_message(
"closure bodies that contain statements must be surrounded by braces",
);
expect_err
.primary_message("closure bodies that contain statements must be surrounded by braces");
let preceding_pipe_span = closure_spans.closing_pipe;
let following_token_span = self.token.span;
@ -951,7 +950,7 @@ impl<'a> Parser<'a> {
);
expect_err.span_note(second_note, "the closure body may be incorrectly delimited");
expect_err.set_span(vec![preceding_pipe_span, following_token_span]);
expect_err.span(vec![preceding_pipe_span, following_token_span]);
let opening_suggestion_str = " {".to_string();
let closing_suggestion_str = "}".to_string();