Consistently avoid '?' throughout serde crate

dtolnay · dtolnay · commit a9320db6f91b · 2022-09-21T21:34:04.000-07:00
This makes it easy to redefine a 'try' macro to compare compile-time
between `$expr?` and `match $expr { Ok=&gt;v, Err=&gt;return }`.
diff --git a/serde/src/de/ignored_any.rs b/serde/src/de/ignored_any.rs
@@ -228,7 +228,7 @@ impl<'de> Visitor<'de> for IgnoredAny {
     where
         A: EnumAccess<'de>,
     {
-        data.variant::<IgnoredAny>()?.1.newtype_variant()
+        try!(data.variant::<IgnoredAny>()).1.newtype_variant()
     }
 }
 
diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
@@ -2268,14 +2268,14 @@ where
     where
         D: Deserializer<'de>,
     {
-        let (start, end) = deserializer.deserialize_struct(
+        let (start, end) = try!(deserializer.deserialize_struct(
             "Range",
             range::FIELDS,
             range::RangeVisitor {
                 expecting: "struct Range",
                 phantom: PhantomData,
             },
-        )?;
+        ));
         Ok(start..end)
     }
 }
@@ -2289,14 +2289,14 @@ where
     where
         D: Deserializer<'de>,
     {
-        let (start, end) = deserializer.deserialize_struct(
+        let (start, end) = try!(deserializer.deserialize_struct(
             "RangeInclusive",
             range::FIELDS,
             range::RangeVisitor {
                 expecting: "struct RangeInclusive",
                 phantom: PhantomData,
             },
-        )?;
+        ));
         Ok(RangeInclusive::new(start, end))
     }
 }
diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
@@ -565,7 +565,7 @@ pub trait Deserialize<'de>: Sized {
         D: Deserializer<'de>,
     {
         // Default implementation just delegates to `deserialize` impl.
-        *place = Deserialize::deserialize(deserializer)?;
+        *place = try!(Deserialize::deserialize(deserializer));
         Ok(())
     }
 }
diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs
@@ -1501,7 +1501,7 @@ where
     where
         T: de::DeserializeSeed<'de>,
     {
-        match self.map.next_key_seed(seed)? {
+        match try!(self.map.next_key_seed(seed)) {
             Some(key) => Ok((key, private::map_as_enum(self.map))),
             None => Err(de::Error::invalid_type(de::Unexpected::Map, &"enum")),
         }
diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs
@@ -614,9 +614,10 @@ impl Serialize for SystemTime {
         S: Serializer,
     {
         use super::SerializeStruct;
-        let duration_since_epoch = self
-            .duration_since(UNIX_EPOCH)
-            .map_err(|_| S::Error::custom("SystemTime must be later than UNIX_EPOCH"))?;
+        let duration_since_epoch = match self.duration_since(UNIX_EPOCH) {
+            Ok(duration_since_epoch) => duration_since_epoch,
+            Err(_) => return Err(S::Error::custom("SystemTime must be later than UNIX_EPOCH")),
+        };
         let mut state = try!(serializer.serialize_struct("SystemTime", 2));
         try!(state.serialize_field("secs_since_epoch", &duration_since_epoch.as_secs()));
         try!(state.serialize_field("nanos_since_epoch", &duration_since_epoch.subsec_nanos()));

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ impl<'de> Visitor<'de> for IgnoredAny {`
`228`	`228`	`where`
`229`	`229`	`A: EnumAccess<'de>,`
`230`	`230`	`{`
`231`		`- data.variant::<IgnoredAny>()?.1.newtype_variant()`
	`231`	`+ try!(data.variant::<IgnoredAny>()).1.newtype_variant()`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -2268,14 +2268,14 @@ where`
`2268`	`2268`	`where`
`2269`	`2269`	`D: Deserializer<'de>,`
`2270`	`2270`	`{`
`2271`		`- let (start, end) = deserializer.deserialize_struct(`
	`2271`	`+ let (start, end) = try!(deserializer.deserialize_struct(`
`2272`	`2272`	`"Range",`
`2273`	`2273`	`range::FIELDS,`
`2274`	`2274`	`range::RangeVisitor {`
`2275`	`2275`	`expecting: "struct Range",`
`2276`	`2276`	`phantom: PhantomData,`
`2277`	`2277`	`},`
`2278`		`- )?;`
	`2278`	`+ ));`
`2279`	`2279`	`Ok(start..end)`
`2280`	`2280`	`}`
`2281`	`2281`	`}`
`@@ -2289,14 +2289,14 @@ where`
`2289`	`2289`	`where`
`2290`	`2290`	`D: Deserializer<'de>,`
`2291`	`2291`	`{`
`2292`		`- let (start, end) = deserializer.deserialize_struct(`
	`2292`	`+ let (start, end) = try!(deserializer.deserialize_struct(`
`2293`	`2293`	`"RangeInclusive",`
`2294`	`2294`	`range::FIELDS,`
`2295`	`2295`	`range::RangeVisitor {`
`2296`	`2296`	`expecting: "struct RangeInclusive",`
`2297`	`2297`	`phantom: PhantomData,`
`2298`	`2298`	`},`
`2299`		`- )?;`
	`2299`	`+ ));`
`2300`	`2300`	`Ok(RangeInclusive::new(start, end))`
`2301`	`2301`	`}`
`2302`	`2302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ pub trait Deserialize<'de>: Sized {`
`565`	`565`	`D: Deserializer<'de>,`
`566`	`566`	`{`
`567`	`567`	// Default implementation just delegates to `deserialize` impl.
`568`		`- *place = Deserialize::deserialize(deserializer)?;`
	`568`	`+ *place = try!(Deserialize::deserialize(deserializer));`
`569`	`569`	`Ok(())`
`570`	`570`	`}`
`571`	`571`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,7 @@ where`
`1501`	`1501`	`where`
`1502`	`1502`	`T: de::DeserializeSeed<'de>,`
`1503`	`1503`	`{`
`1504`		`- match self.map.next_key_seed(seed)? {`
	`1504`	`+ match try!(self.map.next_key_seed(seed)) {`
`1505`	`1505`	`Some(key) => Ok((key, private::map_as_enum(self.map))),`
`1506`	`1506`	`None => Err(de::Error::invalid_type(de::Unexpected::Map, &"enum")),`
`1507`	`1507`	`}`