From ba3c6b4be3adba1997e93a7dcb2b0442fd9d3da7 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias Ratajczak" Date: Thu, 18 Aug 2022 18:36:53 +0200 Subject: [PATCH] 54: fix clippy pedantic lints --- src/euler54/src/card.rs | 7 ++++--- src/euler54/src/value.rs | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/euler54/src/card.rs b/src/euler54/src/card.rs index 9e08ec2..25e5091 100644 --- a/src/euler54/src/card.rs +++ b/src/euler54/src/card.rs @@ -81,10 +81,11 @@ impl Cards { true } - fn contains_value(&self, value: &Value) -> bool { - self.value_hashmap.contains_key(value) + fn contains_value(&self, value: Value) -> bool { + self.value_hashmap.contains_key(&value) } } + pub trait CardTrait { fn to_value_hashmap(&self) -> HashMap; fn to_suit_hashset(&self) -> HashSet; @@ -101,7 +102,7 @@ impl CardTrait for CardsArray { } fn to_value_hashmap(&self) -> HashMap { - let mut hm = HashMap::from_iter(self.to_value_hashset().iter().map(|v| (*v, 0))); + let mut hm: HashMap<_, _> = self.to_value_hashset().iter().map(|v| (*v, 0)).collect(); for card in self { *hm.get_mut(&card.value).unwrap() += 1; } diff --git a/src/euler54/src/value.rs b/src/euler54/src/value.rs index a478b19..66cb3a7 100644 --- a/src/euler54/src/value.rs +++ b/src/euler54/src/value.rs @@ -1,4 +1,4 @@ -use std::slice::Iter; +const NUMBER_VALUES: usize = 13; pub type Values = [Value; 5]; @@ -41,8 +41,8 @@ impl From for Value { } impl Value { - pub fn iterator() -> Iter<'static, Value> { - VALUES.iter() + pub fn iterator() -> std::array::IntoIter { + VALUES.into_iter() } }