@@ -1345,10 +1345,11 @@ impl<'a> Parser<'a> {
13451345 body
13461346 } else {
13471347 let token_str = super :: token_descr ( & self . token ) ;
1348- let mut err = self . fatal ( & format ! (
1348+ let msg = & format ! (
13491349 "expected `where`, `{{`, `(`, or `;` after struct name, found {}" ,
13501350 token_str
1351- ) ) ;
1351+ ) ;
1352+ let mut err = self . struct_span_err ( self . token . span , msg) ;
13521353 err. span_label ( self . token . span , "expected `where`, `{`, `(`, or `;` after struct name" ) ;
13531354 return Err ( err) ;
13541355 } ;
@@ -1371,8 +1372,8 @@ impl<'a> Parser<'a> {
13711372 VariantData :: Struct ( fields, recovered)
13721373 } else {
13731374 let token_str = super :: token_descr ( & self . token ) ;
1374- let mut err = self
1375- . fatal ( & format ! ( "expected `where` or `{{` after union name, found {}" , token_str ) ) ;
1375+ let msg = & format ! ( "expected `where` or `{{` after union name, found {}" , token_str ) ;
1376+ let mut err = self . struct_span_err ( self . token . span , msg ) ;
13761377 err. span_label ( self . token . span , "expected `where` or `{` after union name" ) ;
13771378 return Err ( err) ;
13781379 } ;
@@ -1408,10 +1409,8 @@ impl<'a> Parser<'a> {
14081409 self . eat ( & token:: CloseDelim ( token:: Brace ) ) ;
14091410 } else {
14101411 let token_str = super :: token_descr ( & self . token ) ;
1411- let mut err = self . fatal ( & format ! (
1412- "expected `where`, or `{{` after struct name, found {}" ,
1413- token_str
1414- ) ) ;
1412+ let msg = & format ! ( "expected `where`, or `{{` after struct name, found {}" , token_str) ;
1413+ let mut err = self . struct_span_err ( self . token . span , msg) ;
14151414 err. span_label ( self . token . span , "expected `where`, or `{` after struct name" ) ;
14161415 return Err ( err) ;
14171416 }
0 commit comments