MAINT: Use ? operator instead of try!() macro
This commit is contained in:
+1
-1
@@ -559,7 +559,7 @@ impl<'de, A> Deserialize<'de> for ArrayString<A>
|
||||
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
|
||||
where E: de::Error,
|
||||
{
|
||||
let s = try!(str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self)));
|
||||
let s = str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self))?;
|
||||
|
||||
ArrayString::from(s).map_err(|_| E::invalid_length(s.len(), &self))
|
||||
}
|
||||
|
||||
+1
-1
@@ -1127,7 +1127,7 @@ impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A
|
||||
{
|
||||
let mut values = ArrayVec::<A>::new();
|
||||
|
||||
while let Some(value) = try!(seq.next_element()) {
|
||||
while let Some(value) = seq.next_element()? {
|
||||
if let Err(_) = values.try_push(value) {
|
||||
return Err(SA::Error::invalid_length(A::CAPACITY + 1, &self));
|
||||
}
|
||||
|
||||
+1
-1
@@ -472,7 +472,7 @@ fn test_string() {
|
||||
// Test Error trait / try
|
||||
let t = || -> Result<(), Box<Error>> {
|
||||
let mut t = ArrayString::<[_; 2]>::new();
|
||||
try!(t.try_push_str(text));
|
||||
t.try_push_str(text)?;
|
||||
Ok(())
|
||||
}();
|
||||
assert!(t.is_err());
|
||||
|
||||
Reference in New Issue
Block a user