From 86c07677f11f2f58e4e056d4316ae34c65aa4c5e Mon Sep 17 00:00:00 2001
From: Max Willsey <me@mwillsey.com>
Date: Mon, 19 Aug 2019 15:33:22 -0700
Subject: [PATCH] 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 #96.
---
 .travis.yml    | 15 ++++++++-------
 Cargo.toml     | 10 +++++-----
 README.rst     |  2 ++
 src/lib.rs     |  3 ++-
 tests/quick.rs |  3 +++
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6ae7ef2cd..20bb7aaa5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,11 @@ language: rust
 sudo: false
 matrix:
   include:
+    # MSRV is lower for non-dev builds
     - rust: 1.18.0
-      before_script:
-        # lazy_static 1.1 requires Rust 1.21+, so downgrade it.
-        # (we only use it in benchmarks anyway...)
-        - cargo generate-lockfile
-        - cargo update -p lazy_static --precise 1.0.2
+      env:
+       - SKIP_TEST=1
+    - rust: 1.30.0
     - rust: stable
       env:
        - FEATURES='serde-1'
@@ -22,6 +21,8 @@ branches:
 script:
   - |
       cargo build --verbose --features "$FEATURES" &&
-      cargo test --verbose --features "$FEATURES" &&
-      cargo test --release --verbose --features "$FEATURES" &&
+      if [ -z "$SKIP_TEST" ]; then
+        cargo test --verbose --features "$FEATURES" &&
+        cargo test --release --verbose --features "$FEATURES"
+      fi &&
       cargo doc --verbose --features "$FEATURES"
diff --git a/Cargo.toml b/Cargo.toml
index a054838989..b0cfdeeb6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,12 +31,12 @@ bench = false
 serde = { version = "1.0", optional = true }
 
 [dev-dependencies]
-itertools = "0.7.0" # 0.8 not compiles on Rust 1.18
-rand = "0.4"
-quickcheck = { version = "0.6", default-features = false }
+itertools = "0.8"
+rand = "0.6"
+quickcheck = { version = "0.8", default-features = false }
 fnv = "1.0"
-lazy_static = "1"
-serde_test = "1.0.5"
+lazy_static = "1.3"
+serde_test = "1.0.99"
 
 [features]
 # Serialization with serde 1.0
diff --git a/README.rst b/README.rst
index 3792afe3c3..7fcb2c9891 100644
--- a/README.rst
+++ b/README.rst
@@ -118,6 +118,8 @@ Recent Changes
 
   - Serde trait ``IntoDeserializer`` are implemented for ``IndexMap`` and ``IndexSet``.
 
+  - Minimum Rust version requirement increased to Rust 1.30 for development builds.
+
 - 1.0.2
 
   - The new methods ``IndexMap::insert_full`` and ``IndexSet::insert_full`` are
diff --git a/src/lib.rs b/src/lib.rs
index 1a0655e3f6..d8cc958d59 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,7 +14,8 @@
 //!
 //! ## Rust Version
 //!
-//! This version of indexmap requires Rust 1.18 or later.
+//! This version of indexmap requires Rust 1.18 or later, or 1.30+ for
+//! development builds.
 //!
 //! The indexmap 1.x release series will use a carefully considered version
 //! upgrade policy, where in a later 1.x version, we will raise the minimum
diff --git a/tests/quick.rs b/tests/quick.rs
index 14f267cff1..0c6e8aa4e4 100644
--- a/tests/quick.rs
+++ b/tests/quick.rs
@@ -3,6 +3,7 @@ extern crate indexmap;
 extern crate itertools;
 #[macro_use]
 extern crate quickcheck;
+extern crate rand;
 
 extern crate fnv;
 
@@ -12,6 +13,8 @@ use itertools::Itertools;
 use quickcheck::Arbitrary;
 use quickcheck::Gen;
 
+use rand::Rng;
+
 use fnv::FnvHasher;
 use std::hash::{BuildHasher, BuildHasherDefault};
 type FnvBuilder = BuildHasherDefault<FnvHasher>;