diff options
| -rw-r--r-- | src/libarena/lib.rs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index dae05a368fa..ed83eddc479 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -224,14 +224,14 @@ impl<T> TypedArena<T> { unsafe { // Clear the last chunk, which is partially filled. let mut chunks_borrow = self.chunks.borrow_mut(); - if let Some(mut last_chunk) = chunks_borrow.pop() { + if let Some(mut last_chunk) = chunks_borrow.last_mut() { self.clear_last_chunk(&mut last_chunk); + let len = chunks_borrow.len(); // If `T` is ZST, code below has no effect. - for mut chunk in chunks_borrow.drain(..) { + for mut chunk in chunks_borrow.drain(..len-1) { let cap = chunk.storage.cap(); chunk.destroy(cap); } - chunks_borrow.push(last_chunk); } } } @@ -604,6 +604,15 @@ mod tests { } } + #[bench] + pub fn bench_typed_arena_clear(b: &mut Bencher) { + let mut arena = TypedArena::default(); + b.iter(|| { + arena.alloc(Point { x: 1, y: 2, z: 3 }); + arena.clear(); + }) + } + // Drop tests struct DropCounter<'a> { |