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
42 changes: 32 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["small", "vec", "vector", "stack", "no_std"]
categories = ["data-structures"]
readme = "README.md"
documentation = "https://docs.rs/smallvec/"
include = ["Cargo.toml", "LICENSE-MIT", "LICENSE-APACHE", "README.md", "src/**/*.rs"]
exclude = [".gitignore", "tests/", "scripts/", "fuzz/", "benches/", ".github/"]

[features]
std = []
Expand All @@ -25,7 +25,7 @@ serde_core = { version = "1.0.221", optional = true, default-features = false }
malloc_size_of = { version = "0.1.1", optional = true, default-features = false }

[dev-dependencies]
bincode = "1.0.1"
serde_json = "1.0"

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ rust-smallvec
> **⚠️ Note:**
> This is the code for smallvec 2.0, which is not yet ready for release. For
> details about the changes in version 2.0, please see [#183], [#240], and [#284].
> The status of the v2 branch is tracked on [#425].
>
> The source code for the latest smallvec 1.x.y release can be found on the
> [v1 branch]. Bug fixes for smallvec 1 should be based on that branch, while
Expand All @@ -13,6 +14,7 @@ rust-smallvec
[#183]: https://github.com/servo/rust-smallvec/issues/183
[#240]: https://github.com/servo/rust-smallvec/issues/240
[#284]: https://github.com/servo/rust-smallvec/issues/284
[#425]: https://github.com/servo/rust-smallvec/issues/425

## About smallvec

Expand Down
29 changes: 18 additions & 11 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ fn splice() {
let new = [7, 8, 9, 10];
let u: SmallVec<u8, 1> = v.splice(1..1, new).collect();
assert_eq!(v, [0, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6]);
assert_eq!(u, []);
assert_eq!(u, [0u8; 0]);

// The range is at the beginning and nonempty.
let mut v: SmallVec<u8, 1> = smallvec![0, 1, 2, 3, 4, 5, 6];
Expand Down Expand Up @@ -328,7 +328,7 @@ fn test_split_off_take_all() {
let orig_capacity: usize = vec.capacity();

let split_off = vec.split_off(0);
assert_eq!(&vec[..], &[]);
assert_eq!(&vec[..], &[0u32; 0]);
assert_eq!(&split_off[..], &[1, 2, 3, 4, 5, 6]);
assert_eq!(vec.capacity(), orig_capacity);
assert_eq!(vec.as_ptr(), orig_ptr);
Expand Down Expand Up @@ -538,7 +538,7 @@ fn test_from() {

let vec = vec![];
let small_vec: SmallVec<u8, 3> = SmallVec::from(vec);
assert_eq!(&*small_vec, &[]);
assert_eq!(&*small_vec, &[0u8; 0]);
drop(small_vec);

let vec = vec![1, 2, 3, 4, 5];
Expand Down Expand Up @@ -687,12 +687,12 @@ fn test_into_inner() {
fn test_from_vec() {
let vec = vec![];
let small_vec: SmallVec<u8, 3> = SmallVec::from_vec(vec);
assert_eq!(&*small_vec, &[]);
assert_eq!(&*small_vec, &[0u8; 0]);
drop(small_vec);

let vec = vec![];
let small_vec: SmallVec<u8, 1> = SmallVec::from_vec(vec);
assert_eq!(&*small_vec, &[]);
assert_eq!(&*small_vec, &[0u8; 0]);
drop(small_vec);

let vec = vec![1];
Expand Down Expand Up @@ -801,19 +801,26 @@ fn test_write() {
#[cfg(feature = "serde")]
#[test]
fn test_serde() {
use bincode::{config, deserialize};
use serde_core::{Serialize, Deserialize};
use serde_json::{Serializer, Deserializer};
let mut bytes = Vec::<u8>::new();
let mut serializer = Serializer::new(&mut bytes);
let mut small_vec: SmallVec<i32, 2> = SmallVec::new();
small_vec.push(1);
let encoded = config().limit(100).serialize(&small_vec).unwrap();
let decoded: SmallVec<i32, 2> = deserialize(&encoded).unwrap();
let _ = small_vec.serialize(&mut serializer);
let mut deserializer = Deserializer::from_slice(bytes.as_slice());
let decoded: SmallVec<i32, 2> = SmallVec::deserialize(&mut deserializer).unwrap();
assert_eq!(small_vec, decoded);
small_vec.push(2);
// Spill the vec
small_vec.push(2);
small_vec.push(3);
small_vec.push(4);
// Check again after spilling.
let encoded = config().limit(100).serialize(&small_vec).unwrap();
let decoded: SmallVec<i32, 2> = deserialize(&encoded).unwrap();
let mut bytes = Vec::<u8>::new();
let mut serializer = Serializer::new(&mut bytes);
let _ = small_vec.serialize(&mut serializer);
let mut deserializer = Deserializer::from_slice(bytes.as_slice());
let decoded: SmallVec<i32, 2> = SmallVec::deserialize(&mut deserializer).unwrap();
assert_eq!(small_vec, decoded);
}

Expand Down
Loading