Add ArrayVec::splice and TinyVec::splice (#85)

* Add ArrayVec::splice and TinyVec::splice

Added for closer API parity with std::Vec

* Fix ArrayVec::splice example typo

* Removed FusedIterator bound from splice

This bound could've caused confusing error messages, and was
inconsistent with the Vec API. splice now uses fuse itself to ensure
consistency. Vec::splice consumes the whole iterator at once, so it
essentially has the same behavior, but this implementation gradually
consumes the iterator as elements are drained, so this fuse is necessary
to keep the behavior the same.

* Reserve additional capacity in TinyVecSplice

Used TinyVec::reserve to pre-allocate space for elements being spliced
into the TinyVec after the splicing iterator is dropped. Used the lower
bound like Vec's splice does.

* Run rustfmt
This commit is contained in:
Benjamin Scherer
2020-07-18 00:22:59 -06:00
committed by GitHub
parent af665296b5
commit 04f65e50cf
4 changed files with 714 additions and 31 deletions
+167 -2
View File
@@ -60,6 +60,172 @@ fn TinyVec_drain() {
assert_eq!(Vec::from_iter(tv.clone().drain(1..=2)), vec![2, 3]);
}
#[test]
fn TinyVec_splice() {
let mut tv: TinyVec<[i32; 10]> = Default::default();
tv.push(1);
tv.push(2);
tv.push(3);
// splice returns the same things as drain
assert_eq!(Vec::from_iter(tv.clone().splice(.., None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(..2, None)), vec![1, 2]);
assert_eq!(Vec::from_iter(tv.clone().splice(..3, None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(..=1, None)), vec![1, 2]);
assert_eq!(Vec::from_iter(tv.clone().splice(..=2, None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(0.., None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(1.., None)), vec![2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(0..2, None)), vec![1, 2]);
assert_eq!(Vec::from_iter(tv.clone().splice(0..3, None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(1..2, None)), vec![2]);
assert_eq!(Vec::from_iter(tv.clone().splice(1..3, None)), vec![2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(0..=1, None)), vec![1, 2]);
assert_eq!(Vec::from_iter(tv.clone().splice(0..=2, None)), vec![1, 2, 3]);
assert_eq!(Vec::from_iter(tv.clone().splice(1..=1, None)), vec![2]);
assert_eq!(Vec::from_iter(tv.clone().splice(1..=2, None)), vec![2, 3]);
// splice removes the same things as drain
let mut tv2 = tv.clone();
tv2.splice(.., None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(..2, None);
assert_eq!(tv2, tiny_vec![3]);
let mut tv2 = tv.clone();
tv2.splice(..3, None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(..=1, None);
assert_eq!(tv2, tiny_vec![3]);
let mut tv2 = tv.clone();
tv2.splice(..=2, None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(0.., None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(1.., None);
assert_eq!(tv2, tiny_vec![1]);
let mut tv2 = tv.clone();
tv2.splice(0..2, None);
assert_eq!(tv2, tiny_vec![3]);
let mut tv2 = tv.clone();
tv2.splice(0..3, None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(1..2, None);
assert_eq!(tv2, tiny_vec![1, 3]);
let mut tv2 = tv.clone();
tv2.splice(1..3, None);
assert_eq!(tv2, tiny_vec![1]);
let mut tv2 = tv.clone();
tv2.splice(0..=1, None);
assert_eq!(tv2, tiny_vec![3]);
let mut tv2 = tv.clone();
tv2.splice(0..=2, None);
assert_eq!(tv2, tiny_vec![]);
let mut tv2 = tv.clone();
tv2.splice(1..=1, None);
assert_eq!(tv2, tiny_vec![1, 3]);
let mut tv2 = tv.clone();
tv2.splice(1..=2, None);
assert_eq!(tv2, tiny_vec![1]);
// splice adds the elements correctly
let mut tv2 = tv.clone();
tv2.splice(.., 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(..2, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(..3, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(..=1, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(..=2, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(0.., 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(1.., 4..=6);
assert_eq!(tv2, tiny_vec![1, 4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(0..2, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(0..3, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(1..2, 4..=6);
assert_eq!(tv2, tiny_vec![1, 4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(1..3, 4..=6);
assert_eq!(tv2, tiny_vec![1, 4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(0..=1, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(0..=2, 4..=6);
assert_eq!(tv2, tiny_vec![4, 5, 6]);
let mut tv2 = tv.clone();
tv2.splice(1..=1, 4..=6);
assert_eq!(tv2, tiny_vec![1, 4, 5, 6, 3]);
let mut tv2 = tv.clone();
tv2.splice(1..=2, 4..=6);
assert_eq!(tv2, tiny_vec![1, 4, 5, 6]);
// splice adds the elements correctly when the replacement is smaller
let mut tv2 = tv.clone();
tv2.splice(.., Some(4));
assert_eq!(tv2, tiny_vec![4]);
let mut tv2 = tv.clone();
tv2.splice(..2, Some(4));
assert_eq!(tv2, tiny_vec![4, 3]);
let mut tv2 = tv.clone();
tv2.splice(1.., Some(4));
assert_eq!(tv2, tiny_vec![1, 4]);
let mut tv2 = tv.clone();
tv2.splice(1..=1, Some(4));
assert_eq!(tv2, tiny_vec![1, 4, 3]);
}
#[test]
fn TinyVec_resize() {
let mut tv: TinyVec<[i32; 10]> = Default::default();
@@ -149,6 +315,5 @@ fn TinyVec_move_to_heap_and_shrink() {
assert_eq!(tv.capacity(), 4);
tv.extend(2..=4);
assert_eq!(tv.capacity(), 4);
assert_eq!(tv.as_slice(), [1,2,3,4]);
assert_eq!(tv.as_slice(), [1, 2, 3, 4]);
}