Rollup merge of #62668 - goodmanjonathan:fix-62660, r=estebank

Fix #62660

If the explicitly given type of a `self` parameter fails to parse correctly, we need to propagate the error rather than dropping it and causing an ICE.

Fixes #62660.
This commit is contained in:
Mark Rousskov
2019-07-15 19:55:10 -04:00
committed by GitHub
3 changed files with 20 additions and 1 deletions

View File

@@ -1498,7 +1498,7 @@ impl<'a> Parser<'a> {
F: Fn(&token::Token) -> bool
{
let attrs = self.parse_arg_attributes()?;
if let Ok(Some(mut arg)) = self.parse_self_arg() {
if let Some(mut arg) = self.parse_self_arg()? {
arg.attrs = attrs.into();
return self.recover_bad_self_arg(arg, is_trait_item);
}