Skip to content

Commit

Permalink
fix all tests that use get
Browse files Browse the repository at this point in the history
results now expect values instead of references
  • Loading branch information
lonnen committed Jul 29, 2021
1 parent 7afe78b commit 260d0dd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
/// ```
pub fn is_subset(&self, other: &MultiSet<T, S>) -> 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,
Expand Down Expand Up @@ -563,7 +563,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
///
/// 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) {
Expand Down Expand Up @@ -870,7 +870,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
/// 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<Q: ?Sized>(&self, element: &Q) -> Option<usize>
Expand Down Expand Up @@ -1070,7 +1070,7 @@ impl<T: Eq + Hash + Clone, S: BuildHasher> PartialEq for MultiSet<T, S> {
}

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))
}
}

Expand Down Expand Up @@ -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,
};

Expand Down Expand Up @@ -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,
};

Expand Down
26 changes: 13 additions & 13 deletions tests/test-lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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);
}

Expand All @@ -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();

Expand Down Expand Up @@ -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();
Expand All @@ -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]
Expand All @@ -406,14 +406,14 @@ 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| {
v == 1
});

assert_eq!(mset.distinct_elements().len(), 1);
assert_eq!(mset.get(&5), Some(&1usize));
assert_eq!(mset.get(&5), Some(1usize));
}

0 comments on commit 260d0dd

Please sign in to comment.