From 7c3a1a76d10f530075825866f9a34b1a64bbce64 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias Ratajczak" Date: Fri, 19 Aug 2022 19:39:43 +0200 Subject: [PATCH] remove Primes::pop --- lib/primes/src/lib.rs | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/lib/primes/src/lib.rs b/lib/primes/src/lib.rs index 5fecff4..03b88d0 100644 --- a/lib/primes/src/lib.rs +++ b/lib/primes/src/lib.rs @@ -46,7 +46,7 @@ where set.insert(prime); } } - vector.reverse(); // so that self.pop removes the smallest prime + debug_assert_eq!(number_of_primes, vector.len()); Primes { vector, set } } @@ -97,14 +97,6 @@ where self.vector.is_empty() } - pub fn pop(&mut self) -> Option { - let result = self.vector.pop(); - if let Some(value) = result { - self.set.remove(&value); - } - result - } - pub fn contains(&self, val: &T) -> bool { self.set.contains(val) } @@ -137,18 +129,6 @@ mod test { assert!(!primes.contains(&7)); } - #[test] - fn test_pop() { - let mut primes = Primes::get_between(10, 20); - assert_eq!(primes.len(), 4); - assert!(primes.contains(&19)); - - primes.pop(); - - assert_eq!(primes.len(), 3); - assert!(!primes.contains(&11)); - } - #[test] fn test_example_2() { let primes = Primes::get_between(2, 100_000);