Skip to content

Commit

Permalink
fixes #23 rename to
Browse files Browse the repository at this point in the history
  • Loading branch information
lonnen committed Nov 19, 2020
1 parent 4dbf0cd commit 0bbe69f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ use std::ops;
/// // Check for a specific one.
/// if !bag.contains(&"Hacedor".to_string()) {
/// println!("We have {} words, but Hacedor ain't one.",
/// bag.elements().len());
/// bag.distinct_elements().len());
/// }
///
/// // Remove a word
Expand Down Expand Up @@ -145,7 +145,7 @@ impl<T> MultiSet<T, RandomState> {
///
/// let mset: MultiSet<char> = MultiSet::new();
/// assert_eq!(mset.len(), 0);
/// assert_eq!(mset.elements().len(), 0);
/// assert_eq!(mset.distinct_elements().len(), 0);
/// ```
pub fn new() -> MultiSet<T, RandomState> {
MultiSet {
Expand Down Expand Up @@ -226,11 +226,11 @@ impl<T, S> MultiSet<T, S> {
/// mset.insert('c');
///
/// // Will print in an arbitrary order.
/// for e in mset.elements() {
/// for e in mset.distinct_elements() {
/// println!("{}", e);
/// }
/// ```
pub fn elements(&self) -> Elements<T> {
pub fn distinct_elements(&self) -> Elements<T> {
self.elem_counts.keys()
}

Expand Down Expand Up @@ -540,7 +540,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
/// assert_eq!(mset.insert('a'), false);
///
/// assert_eq!(mset.len(), 2);
/// assert_eq!(mset.elements().len(), 1);
/// assert_eq!(mset.distinct_elements().len(), 1);
/// ```
pub fn insert(&mut self, value: T) -> bool {
self.insert_times(value, 1)
Expand All @@ -561,7 +561,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
/// assert!(mset.insert_times('a', 10));
/// assert!(!mset.insert_times('a', 2));
///
/// assert_eq!(mset.elements().len(), 1);
/// assert_eq!(mset.distinct_elements().len(), 1);
/// assert_eq!(mset.len(), 12);
/// assert_eq!(mset.get(&'a'), Some(&12));
/// ```
Expand Down Expand Up @@ -684,7 +684,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
/// let mut mset: MultiSet<_> = vec!['a', 'b', 'c', 'b', 'a'].iter().cloned().collect();
/// mset.retain(|_, m: usize| m % 2 == 0);
///
/// assert_eq!(mset.elements().len(), 2);
/// assert_eq!(mset.distinct_elements().len(), 2);
/// assert_eq!(mset.len(), 4);
/// ```
pub fn retain<F>(&mut self, mut f: F)
Expand Down Expand Up @@ -917,7 +917,7 @@ impl<T: Hash + Eq, S: BuildHasher> MultiSet<T, S> {
///
/// let mset: MultiSet<_> = MultiSet::from(m);
///
/// assert_eq!(mset.elements().len(), 2);
/// assert_eq!(mset.distinct_elements().len(), 2);
/// assert_eq!(mset.len(), 5);
/// ```
impl<T: Hash + Eq> From<HashMap<T, usize>> for MultiSet<T> {
Expand Down Expand Up @@ -1198,7 +1198,7 @@ impl<T> FusedIterator for ElementCounts<'_, T> {}
/// See its documentation for more.
///
/// [`MultiSet`]: struct.MultiSet.html
/// [`elements`]: struct.MultiSet.html#method.elements
/// [`distinct_elements`]: struct.MultiSet.html#method.distinct_elements
pub type Elements<'a, T> = std::collections::hash_map::Keys<'a, T, usize>;

/// An iterator over the items of a `MultiSet`.
Expand Down
10 changes: 5 additions & 5 deletions tests/test-lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fn test_iterator_over_elements() {
observed += m;
}

assert_eq!(mset.elements().len(), observed_len);
assert_eq!(mset.distinct_elements().len(), observed_len);
assert_eq!(observed, 16);

let mut mset = MultiSet::new();
Expand Down Expand Up @@ -370,7 +370,7 @@ fn test_extend_ref() {

a.extend(&[1, 2, 3, 4]);

assert_eq!(a.elements().len(), 4);
assert_eq!(a.distinct_elements().len(), 4);
assert_eq!(a.len(), 5);
assert!(a.contains(&1));
assert!(a.contains(&2));
Expand All @@ -385,7 +385,7 @@ fn test_extend_ref() {

a.extend(&b);

assert_eq!(a.elements().len(), 5);
assert_eq!(a.distinct_elements().len(), 5);
assert_eq!(a.len(), 8);

assert!(a.contains(&1));
Expand All @@ -403,7 +403,7 @@ fn test_retain() {
let mut mset: MultiSet<_> = [1, 2, 3, 4, 5, 4, 3, 2, 1].iter().cloned().collect();
mset.retain(|&k, _v| k < 3);

assert_eq!(mset.elements().len(), 2);
assert_eq!(mset.distinct_elements().len(), 2);
assert_eq!(mset.len(), 4);

assert_eq!(mset.get(&1), Some(&2usize));
Expand All @@ -414,6 +414,6 @@ fn test_retain() {
v == 1
});

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

0 comments on commit 0bbe69f

Please sign in to comment.