Skip to content

Commit 86c0767

Browse files
committed
Update development dependencies
Also update the travis script and the README to indicate that MSRV is 1.18 for builds, and 1.30 for development builds. Fixes rust-lang#96.
1 parent 0a06966 commit 86c0767

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ language: rust
22
sudo: false
33
matrix:
44
include:
5+
# MSRV is lower for non-dev builds
56
- rust: 1.18.0
6-
before_script:
7-
# lazy_static 1.1 requires Rust 1.21+, so downgrade it.
8-
# (we only use it in benchmarks anyway...)
9-
- cargo generate-lockfile
10-
- cargo update -p lazy_static --precise 1.0.2
7+
env:
8+
- SKIP_TEST=1
9+
- rust: 1.30.0
1110
- rust: stable
1211
env:
1312
- FEATURES='serde-1'
@@ -22,6 +21,8 @@ branches:
2221
script:
2322
- |
2423
cargo build --verbose --features "$FEATURES" &&
25-
cargo test --verbose --features "$FEATURES" &&
26-
cargo test --release --verbose --features "$FEATURES" &&
24+
if [ -z "$SKIP_TEST" ]; then
25+
cargo test --verbose --features "$FEATURES" &&
26+
cargo test --release --verbose --features "$FEATURES"
27+
fi &&
2728
cargo doc --verbose --features "$FEATURES"

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ bench = false
3131
serde = { version = "1.0", optional = true }
3232

3333
[dev-dependencies]
34-
itertools = "0.7.0" # 0.8 not compiles on Rust 1.18
35-
rand = "0.4"
36-
quickcheck = { version = "0.6", default-features = false }
34+
itertools = "0.8"
35+
rand = "0.6"
36+
quickcheck = { version = "0.8", default-features = false }
3737
fnv = "1.0"
38-
lazy_static = "1"
39-
serde_test = "1.0.5"
38+
lazy_static = "1.3"
39+
serde_test = "1.0.99"
4040

4141
[features]
4242
# Serialization with serde 1.0

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ Recent Changes
118118

119119
- Serde trait ``IntoDeserializer`` are implemented for ``IndexMap`` and ``IndexSet``.
120120

121+
- Minimum Rust version requirement increased to Rust 1.30 for development builds.
122+
121123
- 1.0.2
122124

123125
- The new methods ``IndexMap::insert_full`` and ``IndexSet::insert_full`` are

src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
//!
1515
//! ## Rust Version
1616
//!
17-
//! This version of indexmap requires Rust 1.18 or later.
17+
//! This version of indexmap requires Rust 1.18 or later, or 1.30+ for
18+
//! development builds.
1819
//!
1920
//! The indexmap 1.x release series will use a carefully considered version
2021
//! upgrade policy, where in a later 1.x version, we will raise the minimum

tests/quick.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ extern crate indexmap;
33
extern crate itertools;
44
#[macro_use]
55
extern crate quickcheck;
6+
extern crate rand;
67

78
extern crate fnv;
89

@@ -12,6 +13,8 @@ use itertools::Itertools;
1213
use quickcheck::Arbitrary;
1314
use quickcheck::Gen;
1415

16+
use rand::Rng;
17+
1518
use fnv::FnvHasher;
1619
use std::hash::{BuildHasher, BuildHasherDefault};
1720
type FnvBuilder = BuildHasherDefault<FnvHasher>;

0 commit comments

Comments
 (0)