Skip to content

Commit f952e2c

Browse files
committed
MAINT: Use ? operator instead of try!() macro
1 parent c7424b8 commit f952e2c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/array_string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ impl<'de, A> Deserialize<'de> for ArrayString<A>
559559
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
560560
where E: de::Error,
561561
{
562-
let s = try!(str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self)));
562+
let s = str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self))?;
563563

564564
ArrayString::from(s).map_err(|_| E::invalid_length(s.len(), &self))
565565
}

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A
11271127
{
11281128
let mut values = ArrayVec::<A>::new();
11291129

1130-
while let Some(value) = try!(seq.next_element()) {
1130+
while let Some(value) = seq.next_element()? {
11311131
if let Err(_) = values.try_push(value) {
11321132
return Err(SA::Error::invalid_length(A::CAPACITY + 1, &self));
11331133
}

tests/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ fn test_string() {
472472
// Test Error trait / try
473473
let t = || -> Result<(), Box<Error>> {
474474
let mut t = ArrayString::<[_; 2]>::new();
475-
try!(t.try_push_str(text));
475+
t.try_push_str(text)?;
476476
Ok(())
477477
}();
478478
assert!(t.is_err());

0 commit comments

Comments
 (0)