From a480ec1cfb94a155dad64cfad821e4c7d1b8dccb Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 25 Oct 2014 17:58:46 -0700 Subject: [PATCH] Some more if let conversion --- src/lib.rs | 5 ++--- src/message.rs | 5 ++--- src/types/range.rs | 17 +++++++---------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 84c4e351..524392c4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -629,9 +629,8 @@ impl InnerPostgresConnection { fn set_type_names<'a, I>(&mut self, mut it: I) -> PostgresResult<()> where I: Iterator<&'a mut PostgresType> { for ty in it { - match *ty { - PgUnknownType { oid, ref mut name } => *name = try!(self.get_type_name(oid)), - _ => {} + if let &PgUnknownType { oid, ref mut name } = ty { + *name = try!(self.get_type_name(oid)); } } diff --git a/src/message.rs b/src/message.rs index 196daf0b..7429794d 100644 --- a/src/message.rs +++ b/src/message.rs @@ -243,9 +243,8 @@ impl WriteMessage for W { } } - match ident { - Some(ident) => try!(self.write_u8(ident)), - None => () + if let Some(ident) = ident { + try!(self.write_u8(ident)); } let buf = buf.unwrap(); diff --git a/src/types/range.rs b/src/types/range.rs index be35b600..9d39547c 100644 --- a/src/types/range.rs +++ b/src/types/range.rs @@ -337,17 +337,14 @@ impl Range where T: PartialOrd+Normalizable{ let lower = lower.map(Normalizable::normalize); let upper = upper.map(Normalizable::normalize); - match (&lower, &upper) { - (&Some(ref lower), &Some(ref upper)) => { - let empty = match (lower.type_, upper.type_) { - (Inclusive, Inclusive) => lower.value > upper.value, - _ => lower.value >= upper.value - }; - if empty { - return Range { inner: Empty }; - } + if let (&Some(ref lower), &Some(ref upper)) = (&lower, &upper) { + let empty = match (lower.type_, upper.type_) { + (Inclusive, Inclusive) => lower.value > upper.value, + _ => lower.value >= upper.value + }; + if empty { + return Range { inner: Empty }; } - _ => {} } Range { inner: Normal(lower, upper) }