diff --git a/util/src/using_queue.rs b/util/src/using_queue.rs index f7e99cfe4..a5a2b0465 100644 --- a/util/src/using_queue.rs +++ b/util/src/using_queue.rs @@ -68,16 +68,6 @@ impl UsingQueue where T: Clone { self.in_use.clear(); } - /// Returns `Some` reference to first block that `f` returns `true` with it as a parameter - /// or `None` if no such block exists in the queue. - pub fn find_if

(&self, predicate: P) -> Option<&T> where P: Fn(&T) -> bool { - if self.pending.as_ref().map(|r| predicate(r)).unwrap_or(false) { - self.pending.as_ref() - } else { - self.in_use.iter().find(|r| predicate(r)) - } - } - /// Returns `Some` item which is the first that `f` returns `true` with a reference to it /// as a parameter or `None` if no such item exists in the queue. pub fn take_used_if

(&mut self, predicate: P) -> Option where P: Fn(&T) -> bool { @@ -107,7 +97,7 @@ impl UsingQueue where T: Clone { fn should_find_when_pushed() { let mut q = UsingQueue::new(2); q.push(1); - assert!(q.find_if(|i| i == &1).is_some()); + assert!(q.take_used_if(|i| i == &1).is_none()); } #[test] @@ -115,7 +105,7 @@ fn should_find_when_pushed_and_used() { let mut q = UsingQueue::new(2); q.push(1); q.use_last_ref(); - assert!(q.find_if(|i| i == &1).is_some()); + assert!(q.take_used_if(|i| i == &1).is_some()); } #[test] @@ -125,7 +115,7 @@ fn should_find_when_others_used() { q.use_last_ref(); q.push(2); q.use_last_ref(); - assert!(q.find_if(|i| i == &1).is_some()); + assert!(q.take_used_if(|i| i == &1).is_some()); } #[test] @@ -135,7 +125,7 @@ fn should_not_find_when_too_many_used() { q.use_last_ref(); q.push(2); q.use_last_ref(); - assert!(q.find_if(|i| i == &1).is_none()); + assert!(q.take_used_if(|i| i == &1).is_none()); } #[test] @@ -144,7 +134,7 @@ fn should_not_find_when_not_used_and_then_pushed() { q.push(1); q.push(2); q.use_last_ref(); - assert!(q.find_if(|i| i == &1).is_none()); + assert!(q.take_used_if(|i| i == &1).is_none()); } #[test] @@ -174,7 +164,7 @@ fn should_not_find_when_not_used_peeked_and_then_pushed() { q.peek_last_ref(); q.push(2); q.use_last_ref(); - assert!(q.find_if(|i| i == &1).is_none()); + assert!(q.take_used_if(|i| i == &1).is_none()); } #[test]