diff options
| author | Masaki Hara <ackie.h.gmai@gmail.com> | 2017-06-04 14:10:14 +0900 |
|---|---|---|
| committer | Masaki Hara <ackie.h.gmai@gmail.com> | 2017-06-07 12:15:39 +0900 |
| commit | ab72611d8f664684dbd5dd2efe6fd7edff53ee5d (patch) | |
| tree | be15f7c11d1cc858e8286a57851374cf9d1cbceb /src/libsyntax | |
| parent | 76242aebb9d47558124c991a6faf0eb706d35703 (diff) | |
| download | rust-ab72611d8f664684dbd5dd2efe6fd7edff53ee5d.tar.gz rust-ab72611d8f664684dbd5dd2efe6fd7edff53ee5d.zip | |
Replace some matches with try.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/ptr.rs | 5 |
2 files changed, 2 insertions, 8 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()?; diff --git a/src/libsyntax/ptr.rs b/src/libsyntax/ptr.rs index 15111bbba0a..d51ff9860ac 100644 --- a/src/libsyntax/ptr.rs +++ b/src/libsyntax/ptr.rs @@ -211,10 +211,7 @@ impl<T: Encodable> Encodable for P<[T]> { impl<T: Decodable> Decodable for P<[T]> { fn decode<D: Decoder>(d: &mut D) -> Result<P<[T]>, D::Error> { - Ok(P::from_vec(match Decodable::decode(d) { - Ok(t) => t, - Err(e) => return Err(e) - })) + Ok(P::from_vec(Decodable::decode(d)?)) } } |
