Skip to content

Commit 955fdae

Browse files
committed
Rename Parser::span_fatal_err -> Parser::span_err
The name was misleading, it wasn't actually a fatal error.
1 parent d6d0283 commit 955fdae

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

compiler/rustc_parse/src/parser/diagnostics.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,7 @@ impl AttemptLocalParseRecovery {
144144
}
145145

146146
impl<'a> Parser<'a> {
147-
pub(super) fn span_fatal_err<S: Into<MultiSpan>>(
148-
&self,
149-
sp: S,
150-
err: Error,
151-
) -> DiagnosticBuilder<'a> {
147+
pub(super) fn span_err<S: Into<MultiSpan>>(&self, sp: S, err: Error) -> DiagnosticBuilder<'a> {
152148
err.span_err(sp, self.diagnostic())
153149
}
154150

compiler/rustc_parse/src/parser/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ impl<'a> Parser<'a> {
13261326
token::CloseDelim(token::Brace) => {}
13271327
token::DocComment(..) => {
13281328
let previous_span = self.prev_token.span;
1329-
let mut err = self.span_fatal_err(self.token.span, Error::UselessDocComment);
1329+
let mut err = self.span_err(self.token.span, Error::UselessDocComment);
13301330
self.bump(); // consume the doc comment
13311331
let comma_after_doc_seen = self.eat(&token::Comma);
13321332
// `seen_comma` is always false, because we are inside doc block

compiler/rustc_parse/src/parser/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ impl<'a> Parser<'a> {
525525
fn ident_or_err(&mut self) -> PResult<'a, (Ident, /* is_raw */ bool)> {
526526
self.token.ident().ok_or_else(|| match self.prev_token.kind {
527527
TokenKind::DocComment(..) => {
528-
self.span_fatal_err(self.prev_token.span, Error::UselessDocComment)
528+
self.span_err(self.prev_token.span, Error::UselessDocComment)
529529
}
530530
_ => self.expected_ident_found(),
531531
})

compiler/rustc_parse/src/parser/stmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl<'a> Parser<'a> {
168168
fn error_outer_attrs(&self, attrs: &[Attribute]) {
169169
if let [.., last] = attrs {
170170
if last.is_doc_comment() {
171-
self.span_fatal_err(last.span, Error::UselessDocComment).emit();
171+
self.span_err(last.span, Error::UselessDocComment).emit();
172172
} else if attrs.iter().any(|a| a.style == AttrStyle::Outer) {
173173
self.struct_span_err(last.span, "expected statement after outer attribute").emit();
174174
}

0 commit comments

Comments
 (0)