summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-04-24 11:19:12 +0200
committerMatthias Beyer <mail@beyermatthias.de>2020-04-24 11:37:08 +0200
commit61824fcd1db6912fb5173bb2045340948a3c900c (patch)
tree4452d213bcc77348bd397a4a0e496e09f2c8124e
parent6a67b236d202d243d4c8f74cf65d64955cb7c9ab (diff)
Fix: Remove deprecated try!() macro usage
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--src/failable/ops/and.rs2
-rw-r--r--src/failable/ops/or.rs2
-rw-r--r--src/failable/ops/xor.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/failable/ops/and.rs b/src/failable/ops/and.rs
index 4568b71..f0a1584 100644
--- a/src/failable/ops/and.rs
+++ b/src/failable/ops/and.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableAnd<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) && try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? && self.1.filter(e)?)
}
}
diff --git a/src/failable/ops/or.rs b/src/failable/ops/or.rs
index b482e63..9cebc75 100644
--- a/src/failable/ops/or.rs
+++ b/src/failable/ops/or.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableOr<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) || try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? || self.1.filter(e)?)
}
}
diff --git a/src/failable/ops/xor.rs b/src/failable/ops/xor.rs
index 9ccfd8e..d8a83bb 100644
--- a/src/failable/ops/xor.rs
+++ b/src/failable/ops/xor.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableXOr<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) ^ try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? ^ self.1.filter(e)?)
}
}