From 95f32f1ebddae26ac6610040ea93ea3de440089a Mon Sep 17 00:00:00 2001 From: ljedrz Date: Fri, 30 Nov 2018 16:38:30 +0100 Subject: [PATCH] arena: improve common patterns --- src/libarena/lib.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index ed83eddc479..e926a886d63 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -310,13 +310,8 @@ impl Default for DroplessArena { impl DroplessArena { pub fn in_arena(&self, ptr: *const T) -> bool { let ptr = ptr as *const u8 as *mut u8; - for chunk in &*self.chunks.borrow() { - if chunk.start() <= ptr && ptr < chunk.end() { - return true; - } - } - false + self.chunks.borrow().iter().any(|chunk| chunk.start() <= ptr && ptr < chunk.end()) } fn align(&self, align: usize) { @@ -408,7 +403,7 @@ impl DroplessArena { { assert!(!mem::needs_drop::()); assert!(mem::size_of::() != 0); - assert!(slice.len() != 0); + assert!(!slice.is_empty()); let mem = self.alloc_raw( slice.len() * mem::size_of::(),