about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-08 03:46:16 +0000
committerbors <bors@rust-lang.org>2017-06-08 03:46:16 +0000
commite1fa8de0fb900026a1a126928940e4eea3b729b5 (patch)
treeceadfbdc47590ae898d8c6396895d677f41f84ba /src/libsyntax/parse
parentd8d5592596b75ff1b810c15944e6bac57ab9c15a (diff)
parent13ae42fb205e06320647b3f508462c46a2644c07 (diff)
downloadrust-e1fa8de0fb900026a1a126928940e4eea3b729b5.tar.gz
rust-e1fa8de0fb900026a1a126928940e4eea3b729b5.zip
Auto merge of #42522 - frewsxcv:rollup, r=frewsxcv
Rollup of 5 pull requests

- Successful merges: #42470, #42490, #42497, #42510, #42512
- Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d9cb2b4ab7d..1e156ed07b0 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1249,10 +1249,7 @@ impl<'a> Parser<'a> {
             let mac = respan(lo.to(self.prev_span), Mac_ { path: pth, tts: tts });
             (keywords::Invalid.ident(), ast::TraitItemKind::Macro(mac))
         } else {
-            let (constness, unsafety, abi) = match self.parse_fn_front_matter() {
-                Ok(cua) => cua,
-                Err(e) => return Err(e),
-            };
+            let (constness, unsafety, abi) = self.parse_fn_front_matter()?;
 
             let ident = self.parse_ident()?;
             let mut generics = self.parse_generics()?;