From 260d0dd1a3ba544cdbaa64c00136c7d3257bcc38 Mon Sep 17 00:00:00 2001 From: lonnen Date: Thu, 29 Jul 2021 16:24:47 -0700 Subject: [PATCH] fix all tests that use `get` results now expect values instead of references --- src/lib.rs | 12 ++++++------ tests/test-lib.rs | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 79aaa7b..1021c41 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -494,7 +494,7 @@ impl MultiSet { /// ``` pub fn is_subset(&self, other: &MultiSet) -> bool { self.iter() - .all(|(e, m)| *m <= other.get(e).copied().unwrap_or_default()) + .all(|(e, m)| *m <= other.get(e).unwrap_or_default()) } /// Returns `true` if the multiset is a superset of another, @@ -563,7 +563,7 @@ impl MultiSet { /// /// assert_eq!(mset.distinct_elements().len(), 1); /// assert_eq!(mset.len(), 12); - /// assert_eq!(mset.get(&'a'), Some(&12)); + /// assert_eq!(mset.get(&'a'), Some(12)); /// ``` pub fn insert_times(&mut self, value: T, multiplicity: usize) -> bool { match self.elem_counts.entry(value) { @@ -870,7 +870,7 @@ impl MultiSet { /// let mut mset: MultiSet<_> = MultiSet::new(); /// mset.insert('a'); /// - /// assert_eq!(mset.get(&'a'), Some(&1)); + /// assert_eq!(mset.get(&'a'), Some(1)); /// assert_eq!(mset.get(&'b'), None); /// ``` pub fn get(&self, element: &Q) -> Option @@ -1070,7 +1070,7 @@ impl PartialEq for MultiSet { } self.iter() - .all(|(key, value)| other.get(key).map_or(false, |v| *value == *v)) + .all(|(key, value)| other.get(key).map_or(false, |v| *value == v)) } } @@ -1332,7 +1332,7 @@ impl<'a, T: Eq + Hash + Clone, S: BuildHasher> Iterator for Intersection<'a, T, let (elem, count) = self.iter.next()?; let other_count = match self.other.get(elem) { - Some(c) => *c, + Some(c) => c, None => 0usize, }; @@ -1391,7 +1391,7 @@ impl<'a, T: Eq + Hash, S: BuildHasher> Iterator for Difference<'a, T, S> { let (elem, count) = self.iter.next()?; let other_count = match self.other.get(elem) { - Some(c) => *c, + Some(c) => c, None => 0usize, }; diff --git a/tests/test-lib.rs b/tests/test-lib.rs index dd3a5c3..7837f9f 100644 --- a/tests/test-lib.rs +++ b/tests/test-lib.rs @@ -53,12 +53,12 @@ fn test_zero_capacity() { fn test_insert_and_retrieve_elements() { let mut mset = MultiSet::new(); mset.insert('a'); - assert_eq!(mset.get(&'a'), Some(&1)); + assert_eq!(mset.get(&'a'), Some(1)); mset.insert('a'); - assert_eq!(mset.get(&'a'), Some(&2)); + assert_eq!(mset.get(&'a'), Some(2)); mset.insert_times('b', 5); - assert_eq!(mset.get(&'b'), Some(&5)); + assert_eq!(mset.get(&'b'), Some(5)); } #[test] @@ -126,7 +126,7 @@ fn test_retrieving_mset_values() { let mut m1 = MultiSet::new(); m1.insert_times('d', 9); - assert_eq!(m1.get(&'d'), Some(&9)); + assert_eq!(m1.get(&'d'), Some(9)); assert_eq!(m1.get(&'u'), None); } @@ -140,7 +140,7 @@ fn test_mset_clear() { assert!(!mset.is_empty()); - assert_eq!(mset.get(&'c'), Some(&3)); + assert_eq!(mset.get(&'c'), Some(3)); mset.clear(); @@ -377,8 +377,8 @@ fn test_extend_ref() { assert!(a.contains(&3)); assert!(a.contains(&4)); - assert_eq!(a.get(&1), Some(&2)); - assert_eq!(a.get(&2), Some(&1)); + assert_eq!(a.get(&1), Some(2)); + assert_eq!(a.get(&2), Some(1)); assert_eq!(a.get(&5), None); let b: MultiSet<_> = [1, 2, 5].iter().cloned().collect(); @@ -393,9 +393,9 @@ fn test_extend_ref() { assert!(a.contains(&3)); assert!(a.contains(&4)); assert!(a.contains(&5)); - assert_eq!(a.get(&1), Some(&3)); - assert_eq!(a.get(&2), Some(&2)); - assert_eq!(a.get(&5), Some(&1)); + assert_eq!(a.get(&1), Some(3)); + assert_eq!(a.get(&2), Some(2)); + assert_eq!(a.get(&5), Some(1)); } #[test] @@ -406,8 +406,8 @@ fn test_retain() { assert_eq!(mset.distinct_elements().len(), 2); assert_eq!(mset.len(), 4); - assert_eq!(mset.get(&1), Some(&2usize)); - assert_eq!(mset.get(&2), Some(&2usize)); + assert_eq!(mset.get(&1), Some(2usize)); + assert_eq!(mset.get(&2), Some(2usize)); let mut mset: MultiSet<_> = [1, 2, 3, 4, 5, 4, 3, 2, 1].iter().cloned().collect(); mset.retain(|&_k, v| { @@ -415,5 +415,5 @@ fn test_retain() { }); assert_eq!(mset.distinct_elements().len(), 1); - assert_eq!(mset.get(&5), Some(&1usize)); + assert_eq!(mset.get(&5), Some(1usize)); }