Merge branch 'master' into prng

rust-random · Dec 27, 2017 · 1d3439a · 1d3439a
2 parents 8ad6e2a + 85ceba8
commit 1d3439a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,9 @@ libc = { version = "0.2", optional = true }
 winapi = { version = "0.3", features = ["minwindef", "ntsecapi", "profileapi", "winnt"] }
 
 [dev-dependencies]
-log = "0.3.0"
+# log 0.3.9 is a wrapper around 0.4.0 which doesn't work with rustc 1.15
+# To keep our CI pin on 1.15 we require log <= 0.3.8.
+log = "0.3, <=0.3.8"
 
 [workspace]
 members = ["rand-derive"]