From d7d9605cdd3b2198083f07acbd869e9202cd8a35 Mon Sep 17 00:00:00 2001 From: Terence Lee Date: Wed, 22 Jul 2020 18:58:31 -0500 Subject: [PATCH] cargo clippy --- src/version_req.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/version_req.rs b/src/version_req.rs index 2cd4b664..6d242909 100644 --- a/src/version_req.rs +++ b/src/version_req.rs @@ -306,10 +306,10 @@ impl VersionReq { return Ok(From::from(v)); } - return match VersionReq::parse_deprecated(input) { + match VersionReq::parse_deprecated(input) { Some(v) => Err(ReqParseError::DeprecatedVersionRequirement(v)), None => Err(From::from(range_set.err().unwrap())), - }; + } } fn parse_deprecated(version: &str) -> Option { @@ -510,13 +510,11 @@ impl fmt::Display for Range { for (i, ref pred) in self.predicates.iter().enumerate() { if i == 0 { write!(fmt, "{}", pred)?; + } else if self.compat == Compat::Node { + // Node does not expect commas between predicates + write!(fmt, " {}", pred)?; } else { - if self.compat == Compat::Node { - // Node does not expect commas between predicates - write!(fmt, " {}", pred)?; - } else { - write!(fmt, ", {}", pred)?; - } + write!(fmt, ", {}", pred)?; } } Ok(())