From 665567cc910978363e7aa27e0bb71aab0a2d7d6a Mon Sep 17 00:00:00 2001 From: Peter Tseng Date: Sat, 21 Nov 2020 00:27:41 +0000 Subject: [PATCH] phone-number, scale-generator: use range::contains I'm honestly not really convinced by the phone-number one but I guess it's one fewer mention of number_len so it's fine. https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains --- exercises/phone-number/example.rs | 3 +-- exercises/scale-generator/example.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/phone-number/example.rs b/exercises/phone-number/example.rs index 49612212d..88896c988 100644 --- a/exercises/phone-number/example.rs +++ b/exercises/phone-number/example.rs @@ -3,8 +3,7 @@ pub fn number(user_number: &str) -> Option { let number_len = filtered_number.len(); - if number_len < 10 - || number_len > 11 + if !(10..=11).contains(&number_len) || (filtered_number.len() == 11 && !filtered_number.starts_with('1')) { return None; diff --git a/exercises/scale-generator/example.rs b/exercises/scale-generator/example.rs index e7c263e09..6410d9645 100644 --- a/exercises/scale-generator/example.rs +++ b/exercises/scale-generator/example.rs @@ -244,7 +244,7 @@ pub mod note { let mut iter = lc.chars(); let mut note = match iter.next() { - Some(c) if 'a' <= c && 'g' >= c => Note { + Some(c) if ('a'..='g').contains(&c) => Note { tonic: match c { 'a' => Root::A, 'b' => Root::B,