itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 15:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently avoid '?' throughout serde crate

Browse Source 
This makes it easy to redefine a 'try' macro to compare compile-time
between `$expr?` and `match $expr { Ok=>v, Err=>return }`.
This commit is contained in:
David Tolnay 2022-09-21 21:33:24 -07:00
parent d208762c81
commit a9320db6f9
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/src/de/ignored_any.rs
View File

@ -228,7 +228,7 @@ impl<'de> Visitor<'de> for IgnoredAny {
where where
A: EnumAccess<'de>, A: EnumAccess<'de>,
{ {
data.variant::<IgnoredAny>()?.1.newtype_variant() try!(data.variant::<IgnoredAny>()).1.newtype_variant()
} }
} }

8
serde/src/de/impls.rs
View File

@ -2268,14 +2268,14 @@ where
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let (start, end) = deserializer.deserialize_struct( let (start, end) = try!(deserializer.deserialize_struct(
"Range", "Range",
range::FIELDS, range::FIELDS,
range::RangeVisitor { range::RangeVisitor {
expecting: "struct Range", expecting: "struct Range",
phantom: PhantomData, phantom: PhantomData,
}, },
)?; ));
Ok(start..end) Ok(start..end)
} }
} }
@ -2289,14 +2289,14 @@ where
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let (start, end) = deserializer.deserialize_struct( let (start, end) = try!(deserializer.deserialize_struct(
"RangeInclusive", "RangeInclusive",
range::FIELDS, range::FIELDS,
range::RangeVisitor { range::RangeVisitor {
expecting: "struct RangeInclusive", expecting: "struct RangeInclusive",
phantom: PhantomData, phantom: PhantomData,
}, },
)?; ));
Ok(RangeInclusive::new(start, end)) Ok(RangeInclusive::new(start, end))
} }
} }

2
serde/src/de/mod.rs
View File

@ -565,7 +565,7 @@ pub trait Deserialize<'de>: Sized {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
// Default implementation just delegates to `deserialize` impl. // Default implementation just delegates to `deserialize` impl.
*place = Deserialize::deserialize(deserializer)?; *place = try!(Deserialize::deserialize(deserializer));
Ok(()) Ok(())
} }
} }

2
serde/src/de/value.rs
View File

@ -1501,7 +1501,7 @@ where
where where
T: de::DeserializeSeed<'de>, 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))), Some(key) => Ok((key, private::map_as_enum(self.map))),
None => Err(de::Error::invalid_type(de::Unexpected::Map, &"enum")), None => Err(de::Error::invalid_type(de::Unexpected::Map, &"enum")),
} }

7
serde/src/ser/impls.rs
View File

@ -614,9 +614,10 @@ impl Serialize for SystemTime {
S: Serializer, S: Serializer,
{ {
use super::SerializeStruct; use super::SerializeStruct;
let duration_since_epoch = self let duration_since_epoch = match self.duration_since(UNIX_EPOCH) {
.duration_since(UNIX_EPOCH) Ok(duration_since_epoch) => duration_since_epoch,
.map_err(|_| S::Error::custom("SystemTime must be later than UNIX_EPOCH"))?; Err(_) => return Err(S::Error::custom("SystemTime must be later than UNIX_EPOCH")),
};
let mut state = try!(serializer.serialize_struct("SystemTime", 2)); 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("secs_since_epoch", &duration_since_epoch.as_secs()));
try!(state.serialize_field("nanos_since_epoch", &duration_since_epoch.subsec_nanos())); try!(state.serialize_field("nanos_since_epoch", &duration_since_epoch.subsec_nanos()));