Skip to content

Commit b6fc87c

Browse files
committed
de-fatalize some errors
1 parent 2091062 commit b6fc87c

File tree

7 files changed

+17
-9
lines changed

7 files changed

+17
-9
lines changed

src/librustc_parse/parser/diagnostics.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ impl<'a> Parser<'a> {
177177
self.sess.span_diagnostic.span_bug(self.token.span, m)
178178
}
179179

180-
pub(super) fn span_err<S: Into<MultiSpan>>(&self, sp: S, m: &str) {
181-
self.sess.span_diagnostic.span_err(sp, m)
182-
}
183-
184180
pub fn struct_span_err<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> DiagnosticBuilder<'a> {
185181
self.sess.span_diagnostic.struct_span_err(sp, m)
186182
}

src/librustc_parse/parser/expr.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,11 @@ impl<'a> Parser<'a> {
822822
} else {
823823
// Field access `expr.f`
824824
if let Some(args) = segment.args {
825-
self.span_err(args.span(), "field expressions may not have generic arguments");
825+
self.struct_span_err(
826+
args.span(),
827+
"field expressions may not have generic arguments",
828+
)
829+
.emit();
826830
}
827831

828832
let span = lo.to(self.prev_span);

src/librustc_parse/parser/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ impl<'a> Parser<'a> {
617617
// This notably includes paths passed through `ty` macro fragments (#46438).
618618
TyKind::Path(None, path) => path,
619619
_ => {
620-
self.span_err(ty_first.span, "expected a trait, found type");
620+
self.struct_span_err(ty_first.span, "expected a trait, found type").emit();
621621
err_path(ty_first.span)
622622
}
623623
};

src/librustc_parse/parser/path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl<'a> Parser<'a> {
9393
maybe_whole!(self, NtPath, |path| {
9494
if style == PathStyle::Mod && path.segments.iter().any(|segment| segment.args.is_some())
9595
{
96-
self.diagnostic().span_err(path.span, "unexpected generic arguments in path");
96+
self.struct_span_err(path.span, "unexpected generic arguments in path").emit();
9797
}
9898
path
9999
});

src/librustc_parse/parser/stmt.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ impl<'a> Parser<'a> {
193193
if self.prev_token_kind == PrevTokenKind::DocComment {
194194
self.span_fatal_err(self.prev_span, Error::UselessDocComment).emit();
195195
} else if attrs.iter().any(|a| a.style == AttrStyle::Outer) {
196-
self.span_err(self.token.span, "expected statement after outer attribute");
196+
self.struct_span_err(self.token.span, "expected statement after outer attribute")
197+
.emit();
197198
}
198199
}
199200
}

src/test/ui/parser/attr-stmt-expr-attr-bad.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,4 @@ fn main() {}
112112
#[cfg(FALSE)] fn e() { { fn foo() { #[attr]; } } }
113113
//~^ ERROR expected statement after outer attribute
114114
#[cfg(FALSE)] fn e() { { fn foo() { #[attr] } } }
115+
//~^ ERROR expected statement after outer attribute

src/test/ui/parser/attr-stmt-expr-attr-bad.stderr

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,5 +410,11 @@ error: expected statement after outer attribute
410410
LL | #[cfg(FALSE)] fn e() { { fn foo() { #[attr]; } } }
411411
| ^
412412

413-
error: aborting due to 56 previous errors
413+
error: expected statement after outer attribute
414+
--> $DIR/attr-stmt-expr-attr-bad.rs:114:45
415+
|
416+
LL | #[cfg(FALSE)] fn e() { { fn foo() { #[attr] } } }
417+
| ^
418+
419+
error: aborting due to 57 previous errors
414420

0 commit comments

Comments
 (0)