Skip to content

Commit ad60cd9

Browse files
committed
Update to nightly-2020-08-15
1 parent 2501a21 commit ad60cd9

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
nightly: nightly-2020-02-01
2+
nightly: nightly-2020-08-15
33
RUSTFLAGS:
44

55
jobs:

libeir_intern/src/arena.rs

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,11 @@ impl<T> TypedArena<T> {
181181
if let Some(last_chunk) = chunks.last_mut() {
182182
let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
183183
let currently_used_cap = used_bytes / mem::size_of::<T>();
184-
if last_chunk.storage.reserve_in_place(currently_used_cap, n) {
185-
self.end.set(last_chunk.end());
186-
return;
187-
} else {
188-
new_capacity = last_chunk.storage.capacity();
189-
loop {
190-
new_capacity = new_capacity.checked_mul(2).unwrap();
191-
if new_capacity >= currently_used_cap + n {
192-
break;
193-
}
184+
new_capacity = last_chunk.storage.capacity();
185+
loop {
186+
new_capacity = new_capacity.checked_mul(2).unwrap();
187+
if new_capacity >= currently_used_cap + n {
188+
break;
194189
}
195190
}
196191
} else {
@@ -318,19 +313,11 @@ impl DroplessArena {
318313
let (chunk, mut new_capacity);
319314
if let Some(last_chunk) = chunks.last_mut() {
320315
let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
321-
if last_chunk
322-
.storage
323-
.reserve_in_place(used_bytes, needed_bytes)
324-
{
325-
self.end.set(last_chunk.end());
326-
return;
327-
} else {
328-
new_capacity = last_chunk.storage.capacity();
329-
loop {
330-
new_capacity = new_capacity.checked_mul(2).unwrap();
331-
if new_capacity >= used_bytes + needed_bytes {
332-
break;
333-
}
316+
new_capacity = last_chunk.storage.capacity();
317+
loop {
318+
new_capacity = new_capacity.checked_mul(2).unwrap();
319+
if new_capacity >= used_bytes + needed_bytes {
320+
break;
334321
}
335322
}
336323
} else {

0 commit comments

Comments
 (0)