Skip to content

Commit

Permalink
Merge pull request rust-lang#121 from bluss/update-dev-version
Browse files Browse the repository at this point in the history
Test from Rust 1.32 and update rand & quickcheck
  • Loading branch information
bluss authored Apr 11, 2020
2 parents 27f384d + 42affec commit f2142d9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ matrix:
- rust: 1.18.0
env:
- SKIP_TEST=1
- rust: 1.30.0
- rust: 1.32.0
- rust: 1.34.2
- rust: stable
env:
- FEATURES='serde-1'
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ rayon = { version = "1.0", optional = true }

[dev-dependencies]
itertools = "0.8"
rand = "0.6"
quickcheck = { version = "0.8", default-features = false }
rand = {version = "0.7", features = ["small_rng"] }
quickcheck = { version = "0.9", default-features = false }
fnv = "1.0"
lazy_static = "1.3"
serde_test = "1.0.99"
Expand Down
2 changes: 1 addition & 1 deletion benches/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use std::iter::FromIterator;

use rand::rngs::SmallRng;
use rand::seq::SliceRandom;
use rand::FromEntropy;
use rand::SeedableRng;

#[bench]
fn new_hashmap(b: &mut Bencher) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//!
//! ### Rust Version
//!
//! This version of indexmap requires Rust 1.18 or later, or 1.30+ for
//! This version of indexmap requires Rust 1.18 or later, or 1.32+ for
//! development builds, and Rust 1.36+ for using with `alloc` (without `std`),
//! see below.
//!
Expand Down

0 comments on commit f2142d9

Please sign in to comment.