1 files changed, 9 insertions, 11 deletions
diff --git a/vendor/serde_json/src/raw.rs b/vendor/serde_json/src/raw.rs
index 6aa4ffcb6..651f4797d 100644
--- a/vendor/serde_json/src/raw.rs
+++ b/vendor/serde_json/src/raw.rs
@@ -177,11 +177,9 @@ impl RawValue {
     /// - the input has no leading or trailing whitespace, and
     /// - the input has capacity equal to its length.
     pub fn from_string(json: String) -> Result<Box<Self>, Error> {
-        {
-            let borrowed = crate::from_str::<&Self>(&json)?;
-            if borrowed.json.len() < json.len() {
-                return Ok(borrowed.to_owned());
-            }
+        let borrowed = tri!(crate::from_str::<&Self>(&json));
+        if borrowed.json.len() < json.len() {
+            return Ok(borrowed.to_owned());
         }
         Ok(Self::from_owned(json.into_boxed_str()))
     }
@@ -287,7 +285,7 @@ pub fn to_raw_value<T>(value: &T) -> Result<Box<RawValue>, Error>
 where
     T: ?Sized + Serialize,
 {
-    let json_string = crate::to_string(value)?;
+    let json_string = tri!(crate::to_string(value));
     Ok(RawValue::from_owned(json_string.into_boxed_str()))
 }
 
@@ -298,8 +296,8 @@ impl Serialize for RawValue {
     where
         S: Serializer,
     {
-        let mut s = serializer.serialize_struct(TOKEN, 1)?;
-        s.serialize_field(TOKEN, &self.json)?;
+        let mut s = tri!(serializer.serialize_struct(TOKEN, 1));
+        tri!(s.serialize_field(TOKEN, &self.json));
         s.end()
     }
 }
@@ -322,7 +320,7 @@ impl<'de: 'a, 'a> Deserialize<'de> for &'a RawValue {
             where
                 V: MapAccess<'de>,
             {
-                let value = visitor.next_key::<RawKey>()?;
+                let value = tri!(visitor.next_key::<RawKey>());
                 if value.is_none() {
                     return Err(de::Error::invalid_type(Unexpected::Map, &self));
                 }
@@ -352,7 +350,7 @@ impl<'de> Deserialize<'de> for Box<RawValue> {
             where
                 V: MapAccess<'de>,
             {
-                let value = visitor.next_key::<RawKey>()?;
+                let value = tri!(visitor.next_key::<RawKey>());
                 if value.is_none() {
                     return Err(de::Error::invalid_type(Unexpected::Map, &self));
                 }
@@ -392,7 +390,7 @@ impl<'de> Deserialize<'de> for RawKey {
             }
         }
 
-        deserializer.deserialize_identifier(FieldVisitor)?;
+        tri!(deserializer.deserialize_identifier(FieldVisitor));
         Ok(RawKey)
     }
 }