Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "orx-split-vec"
version = "3.22.0"
version = "3.23.0"
edition = "2024"
authors = ["orxfun <orx.ugur.arikan@gmail.com>"]
description = "An efficient dynamic capacity vector with pinned element guarantees."
Expand All @@ -12,7 +12,7 @@ categories = ["data-structures", "rust-patterns", "no-std"]
[dependencies]
orx-iterable = { version = "1.3.0", default-features = false }
orx-pseudo-default = { version = "2.1.0", default-features = false }
orx-pinned-vec = { version = "3.21.0", default-features = false }
orx-pinned-vec = { version = "3.23.0", default-features = false }
orx-concurrent-iter = { version = "3.3.0", default-features = false }

[[bench]]
Expand Down
49 changes: 43 additions & 6 deletions src/pinned_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,50 @@ impl<T, G: Growth> PinnedVec<T> for SplitVec<T, G> {
let last = &mut self.fragments[f];
let available = last.room();

if available < slice.len() {
last.extend_from_slice(&slice[0..available]);
slice = &slice[available..];
match available < slice.len() {
true => {
last.extend_from_slice(&slice[0..available]);
slice = &slice[available..];
self.add_fragment();
}
false => {
last.extend_from_slice(slice);
break;
}
}
}
}

unsafe fn extend_from_nonoverlapping(&mut self, mut src: *const T, count: usize) {
self.len += count;
let mut left = count;
while left > 0 {
if !self.has_capacity_for_one() {
self.add_fragment();
} else {
last.extend_from_slice(slice);
break;
}
let f = self.fragments.len() - 1;

let last = &mut self.fragments[f];
let last_len = last.len();
let last_available = last.room();

let dst = unsafe { last.as_mut_ptr().add(last.len()) };
match last_available < left {
true => {
unsafe { dst.copy_from_nonoverlapping(src, last_available) };
unsafe { last.set_len(last_len + last_available) };
debug_assert_eq!(last.len(), last.capacity());

src = unsafe { src.add(last_available) };
left -= last_available;

self.add_fragment();
}
false => {
unsafe { dst.copy_from_nonoverlapping(src, left) };
unsafe { last.set_len(last_len + left) };
break;
}
}
}
}
Expand Down