mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

melib: StackVec fixups 

Fix bound checks and add clear() method
embed
Manos Pitsidianakis 2019-10-07 16:46:32 +03:00
parent fe4349692e
commit d32f0982a9
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
melib/src/structs.rs
View File

@ -60,7 +60,8 @@ impl<T: Default + Copy + std::fmt::Debug> StackVec<T> {
}
}
pub fn remove(&mut self, i: usize) -> T {
if self.len > self.array.len() {
if self.len >= self.array.len() {
self.len -= 1;
self.heap_vec.remove(i)
} else {
let ret = std::mem::replace(&mut self.array[i], T::default());
@ -74,7 +75,7 @@ impl<T: Default + Copy + std::fmt::Debug> StackVec<T> {
pub fn set(&mut self, i: usize, val: T) {
debug_assert!(i < self.len);
if self.len > self.array.len() {
if self.len >= self.array.len() {
self.heap_vec[i] = val;
if i + 1 < self.array.len() {
self.array[i] = val;
@ -83,6 +84,10 @@ impl<T: Default + Copy + std::fmt::Debug> StackVec<T> {
self.array[i] = val;
}
}
pub fn clear(&mut self) {
self.len = 0;
}
}
pub struct StackVecIter<'a, T: Default + Copy + std::fmt::Debug> {
@ -120,7 +125,7 @@ impl<T: Default + Copy + std::fmt::Debug> Index<usize> for StackVec<T> {
type Output = T;
fn index(&self, idx: usize) -> &T {
if self.len > self.array.len() {
if self.len >= self.array.len() {
&self.heap_vec[idx]
} else {
&self.array[idx]