diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index ed83eddc4796..e926a886d634 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -310,13 +310,8 @@ fn default() -> 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 @@ pub fn alloc_slice(&self, slice: &[T]) -> &mut [T] { 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::(),