From 0b97e08040abf2db504f567d9f60d4b63b56bd2a Mon Sep 17 00:00:00 2001 From: Peter Tseng Date: Wed, 4 Apr 2018 21:00:29 +0000 Subject: [PATCH 1/2] Revert "custom-set: Use `&[...]` instead of `vec![...]` (#457)" This reverts commit 3c64502244629a6777ff31482755adf76d0d5213. --- exercises/custom-set/example.rs | 34 ++--- exercises/custom-set/tests/custom-set.rs | 168 +++++++++++------------ 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/exercises/custom-set/example.rs b/exercises/custom-set/example.rs index ac7f24e68..1017cebbc 100644 --- a/exercises/custom-set/example.rs +++ b/exercises/custom-set/example.rs @@ -11,10 +11,10 @@ impl PartialEq for CustomSet { } impl CustomSet { - pub fn new(inputs: &[T]) -> CustomSet { + pub fn new(inputs: Vec) -> CustomSet { let mut s = CustomSet { collection: Vec::new() }; for input in inputs { - s.add(input.clone()); + s.add(input); } s } @@ -42,26 +42,26 @@ impl CustomSet { } pub fn intersection(&self, other: &Self) -> CustomSet { - CustomSet::new(&self.collection - .iter() - .cloned() - .filter(|c| other.contains(c)) - .collect::>()) + CustomSet::new(self.collection + .iter() + .cloned() + .filter(|c| other.contains(c)) + .collect()) } pub fn union(&self, other: &Self) -> CustomSet { - CustomSet::new(&self.collection - .iter() - .cloned() - .chain(other.collection.iter().cloned()) - .collect::>()) + CustomSet::new(self.collection + .iter() + .cloned() + .chain(other.collection.iter().cloned()) + .collect()) } pub fn difference(&self, other: &Self) -> CustomSet { - CustomSet::new(&self.collection - .iter() - .cloned() - .filter(|c| !other.contains(c)) - .collect::>()) + CustomSet::new(self.collection + .iter() + .cloned() + .filter(|c| !other.contains(c)) + .collect()) } } diff --git a/exercises/custom-set/tests/custom-set.rs b/exercises/custom-set/tests/custom-set.rs index cc2490de6..e71d11a10 100644 --- a/exercises/custom-set/tests/custom-set.rs +++ b/exercises/custom-set/tests/custom-set.rs @@ -4,43 +4,43 @@ use set::*; #[test] fn sets_with_no_elements_are_empty() { - let set: CustomSet<()> = CustomSet::new(&[]); + let set: CustomSet<()> = CustomSet::new(vec![]); assert!(set.is_empty()); } #[test] #[ignore] fn sets_with_elements_are_not_empty() { - let set = CustomSet::new(&[1]); + let set = CustomSet::new(vec![1]); assert!(!set.is_empty()); } #[test] #[ignore] fn nothing_is_contained_in_an_empty_set() { - let set = CustomSet::new(&[]); + let set = CustomSet::new(vec![]); assert!(!set.contains(&1)); } #[test] #[ignore] fn true_when_the_element_is_in_the_set() { - let set = CustomSet::new(&[1, 2, 3]); + let set = CustomSet::new(vec![1, 2, 3]); assert!(set.contains(&1)); } #[test] #[ignore] fn false_when_the_element_is_not_in_the_set() { - let set = CustomSet::new(&[1, 2, 3]); + let set = CustomSet::new(vec![1, 2, 3]); assert!(!set.contains(&4)); } #[test] #[ignore] fn empty_sets_are_subsets_of_each_other() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); assert!(set1.is_subset(&set2)); assert!(set2.is_subset(&set1)); } @@ -48,24 +48,24 @@ fn empty_sets_are_subsets_of_each_other() { #[test] #[ignore] fn empty_set_is_subset_of_non_empty_set() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[1]); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![1]); assert!(set1.is_subset(&set2)); } #[test] #[ignore] fn non_empty_set_is_not_subset_of_empty_set() { - let set1 = CustomSet::new(&[1]); - let set2 = CustomSet::new(&[]); + let set1 = CustomSet::new(vec![1]); + let set2 = CustomSet::new(vec![]); assert!(!set1.is_subset(&set2)); } #[test] #[ignore] fn sets_with_same_elements_are_subsets() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[1, 2, 3]); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![1, 2, 3]); assert!(set1.is_subset(&set2)); assert!(set2.is_subset(&set1)); } @@ -73,24 +73,24 @@ fn sets_with_same_elements_are_subsets() { #[test] #[ignore] fn set_contained_in_other_set_is_a_subset() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[4, 1, 2, 3]); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![4, 1, 2, 3]); assert!(set1.is_subset(&set2)); } #[test] #[ignore] fn set_not_contained_in_other_set_is_not_a_subset_one() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[4, 1, 3]); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![4, 1, 3]); assert!(!set1.is_subset(&set2)); } #[test] #[ignore] fn empty_sets_are_disjoint_with_each_other() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); assert!(set1.is_disjoint(&set2)); assert!(set2.is_disjoint(&set1)); } @@ -98,24 +98,24 @@ fn empty_sets_are_disjoint_with_each_other() { #[test] #[ignore] fn empty_set_disjoint_with_non_empty_set() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[1]); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![1]); assert!(set1.is_disjoint(&set2)); } #[test] #[ignore] fn non_empty_set_disjoint_with_empty_set() { - let set1 = CustomSet::new(&[1]); - let set2 = CustomSet::new(&[]); + let set1 = CustomSet::new(vec![1]); + let set2 = CustomSet::new(vec![]); assert!(set1.is_disjoint(&set2)); } #[test] #[ignore] fn sets_with_one_element_in_common_are_not_disjoint() { - let set1 = CustomSet::new(&[1, 2]); - let set2 = CustomSet::new(&[2, 3]); + let set1 = CustomSet::new(vec![1, 2]); + let set2 = CustomSet::new(vec![2, 3]); assert!(!set1.is_disjoint(&set2)); assert!(!set2.is_disjoint(&set1)); } @@ -123,8 +123,8 @@ fn sets_with_one_element_in_common_are_not_disjoint() { #[test] #[ignore] fn sets_with_no_elements_in_common_are_disjoint() { - let set1 = CustomSet::new(&[1, 2]); - let set2 = CustomSet::new(&[3, 4]); + let set1 = CustomSet::new(vec![1, 2]); + let set2 = CustomSet::new(vec![3, 4]); assert!(set1.is_disjoint(&set2)); assert!(set2.is_disjoint(&set1)); } @@ -132,169 +132,169 @@ fn sets_with_no_elements_in_common_are_disjoint() { #[test] #[ignore] fn empty_sets_are_equal() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); assert_eq!(set1, set2); } #[test] #[ignore] fn empty_set_is_not_equal_to_a_non_empty_set() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[1, 2, 3]); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![1, 2, 3]); assert_ne!(set1, set2); } #[test] #[ignore] fn non_empty_set_is_not_equal_to_an_empty_set() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[]); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![]); assert_ne!(set1, set2); } #[test] #[ignore] fn sets_with_the_same_elements_are_equal() { - let set1 = CustomSet::new(&[1, 2]); - let set2 = CustomSet::new(&[2, 1]); + let set1 = CustomSet::new(vec![1, 2]); + let set2 = CustomSet::new(vec![2, 1]); assert_eq!(set1, set2); } #[test] #[ignore] fn sets_with_different_elements_are_not_equal() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[2, 1, 4]); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![2, 1, 4]); assert_ne!(set1, set2); } #[test] #[ignore] fn add_to_empty_set() { - let mut set = CustomSet::new(&[]); + let mut set = CustomSet::new(vec![]); set.add(3); - assert_eq!(set, CustomSet::new(&[3])); + assert_eq!(set, CustomSet::new(vec![3])); } #[test] #[ignore] fn add_to_non_empty_set() { - let mut set = CustomSet::new(&[1, 2, 4]); + let mut set = CustomSet::new(vec![1, 2, 4]); set.add(3); - assert_eq!(set, CustomSet::new(&[1, 2, 3, 4])); + assert_eq!(set, CustomSet::new(vec![1, 2, 3, 4])); } #[test] #[ignore] fn add_existing_element() { - let mut set = CustomSet::new(&[1, 2, 3]); + let mut set = CustomSet::new(vec![1, 2, 3]); set.add(3); - assert_eq!(set, CustomSet::new(&[1, 2, 3])); + assert_eq!(set, CustomSet::new(vec![1, 2, 3])); } #[test] #[ignore] fn intersecting_empty_sets_return_empty_set() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); - assert_eq!(set1.intersection(&set2), CustomSet::new(&[])); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); + assert_eq!(set1.intersection(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn intersecting_empty_set_with_non_empty_returns_empty_set() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[3, 2, 5]); - assert_eq!(set1.intersection(&set2), CustomSet::new(&[])); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![3, 2, 5]); + assert_eq!(set1.intersection(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn intersecting_non_empty_set_with_empty_returns_empty_set() { - let set1 = CustomSet::new(&[1, 2, 3, 4]); - let set2 = CustomSet::new(&[]); - assert_eq!(set1.intersection(&set2), CustomSet::new(&[])); + let set1 = CustomSet::new(vec![1, 2, 3, 4]); + let set2 = CustomSet::new(vec![]); + assert_eq!(set1.intersection(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn intersection_of_two_sets_with_no_shared_elements_is_an_empty_set() { - let set1 = CustomSet::new(&[1, 2, 3]); - let set2 = CustomSet::new(&[4, 5, 6]); - assert_eq!(set1.intersection(&set2), CustomSet::new(&[])); - assert_eq!(set2.intersection(&set1), CustomSet::new(&[])); + let set1 = CustomSet::new(vec![1, 2, 3]); + let set2 = CustomSet::new(vec![4, 5, 6]); + assert_eq!(set1.intersection(&set2), CustomSet::new(vec![])); + assert_eq!(set2.intersection(&set1), CustomSet::new(vec![])); } #[test] #[ignore] fn intersection_of_two_sets_with_shared_elements_is_a_set_of_the_shared_elements() { - let set1 = CustomSet::new(&[1, 2, 3, 4]); - let set2 = CustomSet::new(&[3, 2, 5]); - assert_eq!(set1.intersection(&set2), CustomSet::new(&[2, 3])); - assert_eq!(set2.intersection(&set1), CustomSet::new(&[2, 3])); + let set1 = CustomSet::new(vec![1, 2, 3, 4]); + let set2 = CustomSet::new(vec![3, 2, 5]); + assert_eq!(set1.intersection(&set2), CustomSet::new(vec![2, 3])); + assert_eq!(set2.intersection(&set1), CustomSet::new(vec![2, 3])); } #[test] #[ignore] fn difference_of_two_empty_sets_is_empty_set() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); - assert_eq!(set1.difference(&set2), CustomSet::new(&[])); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); + assert_eq!(set1.difference(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn difference_of_an_empty_and_non_empty_set_is_an_empty_set() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[3, 2, 5]); - assert_eq!(set1.difference(&set2), CustomSet::new(&[])); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![3, 2, 5]); + assert_eq!(set1.difference(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn difference_of_a_non_empty_set_and_empty_set_is_the_non_empty_set() { - let set1 = CustomSet::new(&[1, 2, 3, 4]); - let set2 = CustomSet::new(&[]); - assert_eq!(set1.difference(&set2), CustomSet::new(&[1, 2, 3, 4])); + let set1 = CustomSet::new(vec![1, 2, 3, 4]); + let set2 = CustomSet::new(vec![]); + assert_eq!(set1.difference(&set2), CustomSet::new(vec![1, 2, 3, 4])); } #[test] #[ignore] fn difference_of_two_non_empty_sets_is_elements_only_in_first_set_one() { - let set1 = CustomSet::new(&[3, 2, 1]); - let set2 = CustomSet::new(&[2, 4]); - assert_eq!(set1.difference(&set2), CustomSet::new(&[1, 3])); + let set1 = CustomSet::new(vec![3, 2, 1]); + let set2 = CustomSet::new(vec![2, 4]); + assert_eq!(set1.difference(&set2), CustomSet::new(vec![1, 3])); } #[test] #[ignore] fn union_of_two_empty_sets_is_empty_set() { - let set1: CustomSet<()> = CustomSet::new(&[]); - let set2: CustomSet<()> = CustomSet::new(&[]); - assert_eq!(set1.union(&set2), CustomSet::new(&[])); + let set1: CustomSet<()> = CustomSet::new(vec![]); + let set2: CustomSet<()> = CustomSet::new(vec![]); + assert_eq!(set1.union(&set2), CustomSet::new(vec![])); } #[test] #[ignore] fn union_of_empty_set_and_non_empty_set_is_all_elements() { - let set1 = CustomSet::new(&[]); - let set2 = CustomSet::new(&[2]); - assert_eq!(set1.union(&set2), CustomSet::new(&[2])); + let set1 = CustomSet::new(vec![]); + let set2 = CustomSet::new(vec![2]); + assert_eq!(set1.union(&set2), CustomSet::new(vec![2])); } #[test] #[ignore] fn union_of_non_empty_set_and_empty_set_is_the_non_empty_set() { - let set1 = CustomSet::new(&[1, 3]); - let set2 = CustomSet::new(&[]); - assert_eq!(set1.union(&set2), CustomSet::new(&[1, 3])); + let set1 = CustomSet::new(vec![1, 3]); + let set2 = CustomSet::new(vec![]); + assert_eq!(set1.union(&set2), CustomSet::new(vec![1, 3])); } #[test] #[ignore] fn union_of_non_empty_sets_contains_all_unique_elements() { - let set1 = CustomSet::new(&[1, 3]); - let set2 = CustomSet::new(&[2, 3]); - assert_eq!(set1.union(&set2), CustomSet::new(&[3, 2, 1])); + let set1 = CustomSet::new(vec![1, 3]); + let set2 = CustomSet::new(vec![2, 3]); + assert_eq!(set1.union(&set2), CustomSet::new(vec![3, 2, 1])); } From 265b86322da3c967c61a2ce3f9524415cc5aac1a Mon Sep 17 00:00:00 2001 From: Peter Tseng Date: Sat, 10 Mar 2018 17:01:25 +0000 Subject: [PATCH 2/2] custom-set: take IntoIterator --- exercises/custom-set/example.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/exercises/custom-set/example.rs b/exercises/custom-set/example.rs index 1017cebbc..eac2349a3 100644 --- a/exercises/custom-set/example.rs +++ b/exercises/custom-set/example.rs @@ -11,7 +11,7 @@ impl PartialEq for CustomSet { } impl CustomSet { - pub fn new(inputs: Vec) -> CustomSet { + pub fn new(inputs: I) -> CustomSet where I: IntoIterator { let mut s = CustomSet { collection: Vec::new() }; for input in inputs { s.add(input); @@ -44,24 +44,24 @@ impl CustomSet { pub fn intersection(&self, other: &Self) -> CustomSet { CustomSet::new(self.collection .iter() + .filter(|c| other.contains(*c)) .cloned() - .filter(|c| other.contains(c)) - .collect()) + ) } pub fn union(&self, other: &Self) -> CustomSet { CustomSet::new(self.collection .iter() + .chain(other.collection.iter()) .cloned() - .chain(other.collection.iter().cloned()) - .collect()) + ) } pub fn difference(&self, other: &Self) -> CustomSet { CustomSet::new(self.collection .iter() + .filter(|c| !other.contains(*c)) .cloned() - .filter(|c| !other.contains(c)) - .collect()) + ) } }