diff options
| author | bors <bors@rust-lang.org> | 2019-07-16 05:03:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-16 05:03:20 +0000 |
| commit | 02785dabad07d19b8c76a7f86763801d5d3497ff (patch) | |
| tree | d2b3c2f98ca7ab753a084f6c2e1450539cd9b7ea /src/libsyntax/parse | |
| parent | 4b65a86ebace8600c8e269e8bfe3365cdc460e68 (diff) | |
| parent | da0c8feba49e5741420f545add7243e7c0ecc881 (diff) | |
| download | rust-02785dabad07d19b8c76a7f86763801d5d3497ff.tar.gz rust-02785dabad07d19b8c76a7f86763801d5d3497ff.zip | |
Auto merge of #62704 - Mark-Simulacrum:rollup-oi94s2j, r=Mark-Simulacrum
Rollup of 14 pull requests Successful merges: - #62103 (Add debug assertions to write_bytes and copy*) - #62405 (Remove never_type feature requirement for exhaustive patterns) - #62491 (Fix Pin urls in Option documentation) - #62533 (Add missing links for CannotReallocInPlace type) - #62634 (Less unsafe in the array example of MaybeUninit docs) - #62639 (Make VaListImpl<'f> invariant over the 'f lifetime) - #62646 (Tweak wording in feature gate errors) - #62662 (add spaces in front of trait requirements in libcore/cell.rs) - #62668 (Fix #62660) - #62673 (miri validation: better error messages for dangling references) - #62680 (Actually call `visit_block_entry` in `DataflowResultsConsumer`) - #62685 (Add info about undefined behavior to as_ref suggestions) - #62689 (Fix typo in RawWaker::new documentation) - #62698 (SGX target: don't pretend to be GNU/Linux to LLVM) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8968ca1793a..050b614d147 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -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); } |
