From b9c44073ce0294f16a379a265388c4f6885af01b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 16 Aug 2019 11:25:12 -0700 Subject: [PATCH] Update serde_test to use question mark --- serde_test/src/de.rs | 16 ++++++++-------- serde_test/src/ser.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index 60e08a31..c9bcee5b 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -89,11 +89,11 @@ impl<'de> Deserializer<'de> { where V: Visitor<'de>, { - let value = try!(visitor.visit_seq(DeserializerSeqVisitor { + let value = visitor.visit_seq(DeserializerSeqVisitor { de: self, len: len, end: end, - },)); + })?; assert_next_token!(self, end); Ok(value) } @@ -107,11 +107,11 @@ impl<'de> Deserializer<'de> { where V: Visitor<'de>, { - let value = try!(visitor.visit_map(DeserializerMapVisitor { + let value = visitor.visit_map(DeserializerMapVisitor { de: self, len: len, end: end, - },)); + })?; assert_next_token!(self, end); Ok(value) } @@ -456,11 +456,11 @@ impl<'de, 'a> EnumAccess<'de> for DeserializerEnumVisitor<'a, 'de> { | Token::TupleVariant { variant: v, .. } | Token::StructVariant { variant: v, .. } => { let de = v.into_deserializer(); - let value = try!(seed.deserialize(de)); + let value = seed.deserialize(de)?; Ok((value, self)) } _ => { - let value = try!(seed.deserialize(&mut *self.de)); + let value = seed.deserialize(&mut *self.de)?; Ok((value, self)) } } @@ -613,7 +613,7 @@ impl<'de, 'a> MapAccess<'de> for EnumMapVisitor<'a, 'de> { len: None, end: Token::TupleVariantEnd, }; - try!(seed.deserialize(SeqAccessDeserializer::new(visitor))) + seed.deserialize(SeqAccessDeserializer::new(visitor))? }; assert_next_token!(self.de, Token::TupleVariantEnd); Ok(value) @@ -625,7 +625,7 @@ impl<'de, 'a> MapAccess<'de> for EnumMapVisitor<'a, 'de> { len: None, end: Token::StructVariantEnd, }; - try!(seed.deserialize(MapAccessDeserializer::new(visitor))) + seed.deserialize(MapAccessDeserializer::new(visitor))? }; assert_next_token!(self.de, Token::StructVariantEnd); Ok(value) diff --git a/serde_test/src/ser.rs b/serde_test/src/ser.rs index 091ac434..0ff6c828 100644 --- a/serde_test/src/ser.rs +++ b/serde_test/src/ser.rs @@ -427,7 +427,7 @@ impl<'s, 'a> ser::SerializeStruct for &'s mut Serializer<'a> { where T: Serialize, { - try!(key.serialize(&mut **self)); + key.serialize(&mut **self)?; value.serialize(&mut **self) } @@ -449,7 +449,7 @@ impl<'s, 'a> ser::SerializeStructVariant for Variant<'s, 'a> { where T: Serialize, { - try!(key.serialize(&mut *self.ser)); + key.serialize(&mut *self.ser)?; value.serialize(&mut *self.ser) }