From f952e2c7889b8bc78e7a3b158e2090d76d97f689 Mon Sep 17 00:00:00 2001 From: bluss Date: Mon, 2 Sep 2019 22:04:44 +0200 Subject: [PATCH] MAINT: Use ? operator instead of try!() macro --- src/array_string.rs | 2 +- src/lib.rs | 2 +- tests/tests.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/array_string.rs b/src/array_string.rs index 5159dfb..42bb1a0 100644 --- a/src/array_string.rs +++ b/src/array_string.rs @@ -559,7 +559,7 @@ impl<'de, A> Deserialize<'de> for ArrayString fn visit_bytes(self, v: &[u8]) -> Result 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)) } diff --git a/src/lib.rs b/src/lib.rs index 1c176fe..a04ecce 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1127,7 +1127,7 @@ impl<'de, T: Deserialize<'de>, A: Array> Deserialize<'de> for ArrayVec::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)); } diff --git a/tests/tests.rs b/tests/tests.rs index f8bcd0f..aa84ed4 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -472,7 +472,7 @@ fn test_string() { // Test Error trait / try let t = || -> Result<(), Box> { let mut t = ArrayString::<[_; 2]>::new(); - try!(t.try_push_str(text)); + t.try_push_str(text)?; Ok(()) }(); assert!(t.is_err());