From cf18e9a223bd49fbc569a063857bbd2a15de0cb5 Mon Sep 17 00:00:00 2001 From: Robert Czechowski <czechowski@bwinf.de> Date: Fri, 8 Nov 2019 22:09:46 +0100 Subject: [PATCH] Clippy fix: Replace try! macro by ? operator --- iron-sessionstorage/src/backends/redis.rs | 10 ++++------ iron-sessionstorage/src/lib.rs | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/iron-sessionstorage/src/backends/redis.rs b/iron-sessionstorage/src/backends/redis.rs index 6976e3ff..85634bc6 100644 --- a/iron-sessionstorage/src/backends/redis.rs +++ b/iron-sessionstorage/src/backends/redis.rs @@ -63,15 +63,13 @@ pub struct RedisBackend { impl RedisBackend { pub fn new<T: redis::IntoConnectionInfo>(params: T) -> Result<Self> { - let manager = try!( + let manager = RedisConnectionManager::new(params) - .chain_err(|| "Couldn't create redis connection manager") - ); - let pool = try!( + .chain_err(|| "Couldn't create redis connection manager")?; + let pool = r2d2::Pool::builder() .build(manager) - .chain_err(|| "Couldn't create redis connection pool") - ); + .chain_err(|| "Couldn't create redis connection pool")?; Ok(RedisBackend { pool: pool }) } diff --git a/iron-sessionstorage/src/lib.rs b/iron-sessionstorage/src/lib.rs index 6a75f610..748f9679 100644 --- a/iron-sessionstorage/src/lib.rs +++ b/iron-sessionstorage/src/lib.rs @@ -82,7 +82,7 @@ pub trait Value: Sized + 'static { impl Session { /// Get a `Value` from the session. pub fn get<T: Value + Sized + 'static>(&self) -> IronResult<Option<T>> { - Ok(try!(self.inner.get_raw(T::get_key())).and_then(T::from_raw)) + Ok(self.inner.get_raw(T::get_key())?.and_then(T::from_raw)) } /// Set a `Value` in the session. @@ -112,8 +112,8 @@ impl<B: SessionBackend> AroundMiddleware for SessionStorage<B> { let s = req.extensions.remove::<SessionKey>().unwrap(); if s.has_changed { match res { - Ok(ref mut r) => try!(s.inner.write(r)), - Err(ref mut e) => try!(s.inner.write(&mut e.response)) + Ok(ref mut r) => s.inner.write(r)?, + Err(ref mut e) => s.inner.write(&mut e.response)? } }; res -- GitLab