Skip to content

Commit 0b2b4e5

Browse files
authored
Auto merge of #249 - mbrubeck:bump, r=jdm
Version 1.6.0 Release notes: * The `union` feature is now compatible with stable Rust 1.49 (#248, #247). * Fixed warnings when compiling with Rust 1.51 nightly (#242, #246).
2 parents 73a8953 + 7ec5548 commit 0b2b4e5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ script: |
2424
cargo test --verbose &&
2525
cargo test --verbose --features serde &&
2626
([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
27-
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
27+
([ $TRAVIS_RUST_VERSION != beta ] || cargo test --verbose --features union) &&
2828
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
2929
([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench) &&
3030
([ $TRAVIS_RUST_VERSION != nightly ] || bash ./scripts/run_miri.sh) &&

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "smallvec"
3-
version = "1.5.1"
3+
version = "1.6.0"
44
edition = "2018"
55
authors = ["The Servo Project Developers"]
66
license = "MIT/Apache-2.0"

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
//!
2929
//! ### `union`
3030
//!
31-
//! **This feature requires Rust 1.50.**
31+
//! **This feature requires Rust 1.49.**
3232
//!
3333
//! When the `union` feature is enabled `smallvec` will track its state (inline or spilled)
3434
//! without the use of an enum tag, reducing the size of the `smallvec` by one machine word.
@@ -37,7 +37,7 @@
3737
//! machine words.
3838
//!
3939
//! To use this feature add `features = ["union"]` in the `smallvec` section of Cargo.toml.
40-
//! Note that this feature requires Rust 1.50.
40+
//! Note that this feature requires Rust 1.49.
4141
//!
4242
//! Tracking issue: [rust-lang/rust#55149](https://github.com/rust-lang/rust/issues/55149)
4343
//!

0 commit comments

Comments
 (0)