commit 46901c4fa3671337726d2d0c277696385cc5ceef
author Diggory Hardy <dhardy@users.noreply.github.com> Wed Dec 27 15:06:11 2017 +0000
committer GitHub <noreply@github.com> Wed Dec 27 15:06:11 2017 +0000
tree ea90cb9af77ed5e6b4471cc2d23321872d2e0224
parent 2aa1e68422ac674bda8f01d2633a6a8096000141
parent af6a47f776c99841b933eed6a3082b92627d89d9

Merge pull request #213 from MaloJaffre/patch-2

Bump to 0.3.19

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1cb2e68..f4be379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: rust
 sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
 
 matrix:
   include:
@@ -11,16 +9,19 @@
       os: osx
     - rust: beta
     - rust: nightly
+      before_script:
+        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
       script:
-        - cargo test
+        - cargo doc --no-deps --all-features
+        - cargo bench
         - cargo test --features nightly
-        - cargo test --manifest-path rand-derive/Cargo.toml
-        - cargo doc --no-deps --features nightly
+      after_success:
+        - travis-cargo --only nightly doc-upload
+
 script:
   - cargo test
   - cargo test --manifest-path rand-derive/Cargo.toml
-after_success:
-  - travis-cargo --only nightly doc-upload
+
 env:
   global:
     secure: "BdDntVHSompN+Qxz5Rz45VI4ZqhD72r6aPl166FADlnkIwS6N6FLWdqs51O7G5CpoMXEDvyYrjmRMZe/GYLIG9cmqmn/wUrWPO+PauGiIuG/D2dmfuUNvSTRcIe7UQLXrfP3yyfZPgqsH6pSnNEVopquQKy3KjzqepgriOJtbyY="

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index fada831..44dbd4e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rand"
-version = "0.3.18"
+version = "0.3.19"
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -21,7 +21,9 @@
 libc = "0.2"
 
 [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"]

src/os.rs

diff --git a/src/os.rs b/src/os.rs
index 1eb903a..a54e4ea 100644
--- a/src/os.rs
+++ b/src/os.rs
@@ -53,13 +53,13 @@
     }
 }
 
-fn next_u32(mut fill_buf: &mut FnMut(&mut [u8])) -> u32 {
+fn next_u32(fill_buf: &mut FnMut(&mut [u8])) -> u32 {
     let mut buf: [u8; 4] = [0; 4];
     fill_buf(&mut buf);
     unsafe { mem::transmute::<[u8; 4], u32>(buf) }
 }
 
-fn next_u64(mut fill_buf: &mut FnMut(&mut [u8])) -> u64 {
+fn next_u64(fill_buf: &mut FnMut(&mut [u8])) -> u64 {
     let mut buf: [u8; 8] = [0; 8];
     fill_buf(&mut buf);
     unsafe { mem::transmute::<[u8; 8], u64>(buf) }