From 13ca924988b05d894b8259b0ecd81656f5b3db5c Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Tue, 31 Dec 2019 01:19:53 +0100 Subject: [PATCH] parser::item: remove .fatal calls --- src/librustc_parse/parser/item.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/librustc_parse/parser/item.rs b/src/librustc_parse/parser/item.rs index d7b242f6101..e5a7361b12a 100644 --- a/src/librustc_parse/parser/item.rs +++ b/src/librustc_parse/parser/item.rs @@ -1345,10 +1345,11 @@ fn parse_item_struct(&mut self) -> PResult<'a, ItemInfo> { body } else { let token_str = super::token_descr(&self.token); - let mut err = self.fatal(&format!( + let msg = &format!( "expected `where`, `{{`, `(`, or `;` after struct name, found {}", token_str - )); + ); + let mut err = self.struct_span_err(self.token.span, msg); err.span_label(self.token.span, "expected `where`, `{`, `(`, or `;` after struct name"); return Err(err); }; @@ -1371,8 +1372,8 @@ fn parse_item_union(&mut self) -> PResult<'a, ItemInfo> { VariantData::Struct(fields, recovered) } else { let token_str = super::token_descr(&self.token); - let mut err = self - .fatal(&format!("expected `where` or `{{` after union name, found {}", token_str)); + let msg = &format!("expected `where` or `{{` after union name, found {}", token_str); + let mut err = self.struct_span_err(self.token.span, msg); err.span_label(self.token.span, "expected `where` or `{` after union name"); return Err(err); }; @@ -1408,10 +1409,8 @@ fn parse_record_struct_body( self.eat(&token::CloseDelim(token::Brace)); } else { let token_str = super::token_descr(&self.token); - let mut err = self.fatal(&format!( - "expected `where`, or `{{` after struct name, found {}", - token_str - )); + let msg = &format!("expected `where`, or `{{` after struct name, found {}", token_str); + let mut err = self.struct_span_err(self.token.span, msg); err.span_label(self.token.span, "expected `where`, or `{` after struct name"); return Err(err); } -- 2.44.0