Skip to content

Commit 01354f1

Browse files
author
bors-servo
authored
Auto merge of #111 - mbrubeck:test, r=emilio
Fix error in cargo test --features serde This was broken when updating to bincode 1.0. Also fixes our config so this gets tested on Travis. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/111) <!-- Reviewable:end -->
2 parents feb42bd + d31072c commit 01354f1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ rust:
66
script: |
77
cargo build --verbose &&
88
cargo test --verbose &&
9+
cargo test --verbose --features serde &&
910
([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
1011
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
12+
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
1113
([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench)
1214
notifications:
1315
webhooks: http://build.servo.org:54856/travis

lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,18 +2066,18 @@ mod tests {
20662066
#[cfg(feature = "serde")]
20672067
#[test]
20682068
fn test_serde() {
2069-
use self::bincode::{serialize, deserialize, Bounded};
2069+
use self::bincode::{config, deserialize};
20702070
let mut small_vec: SmallVec<[i32; 2]> = SmallVec::new();
20712071
small_vec.push(1);
2072-
let encoded = serialize(&small_vec, Bounded(100)).unwrap();
2072+
let encoded = config().limit(100).serialize(&small_vec).unwrap();
20732073
let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
20742074
assert_eq!(small_vec, decoded);
20752075
small_vec.push(2);
20762076
// Spill the vec
20772077
small_vec.push(3);
20782078
small_vec.push(4);
20792079
// Check again after spilling.
2080-
let encoded = serialize(&small_vec, Bounded(100)).unwrap();
2080+
let encoded = config().limit(100).serialize(&small_vec).unwrap();
20812081
let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
20822082
assert_eq!(small_vec, decoded);
20832083
}

0 commit comments

Comments
 (0)