diff --git a/.travis.yml b/.travis.yml index 92e06704..7d2f906e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: rust sudo: false dist: trusty rust: -- 1.32.0 +- 1.36.0 - stable - beta - nightly diff --git a/appveyor.yml b/appveyor.yml index fc3f8283..41c464ba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: - TARGET: nightly-i686-pc-windows-msvc - TARGET: nightly-x86_64-pc-windows-gnu - TARGET: nightly-i686-pc-windows-gnu - - TARGET: 1.32.0-x86_64-pc-windows-gnu + - TARGET: 1.36.0-x86_64-pc-windows-gnu install: - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe" - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null diff --git a/proptest/Cargo.toml b/proptest/Cargo.toml index f6acfd83..cfad06e1 100644 --- a/proptest/Cargo.toml +++ b/proptest/Cargo.toml @@ -95,15 +95,15 @@ version = "0.5.0" optional = true [dependencies.rand] -version = "0.7" +version = "0.8" default-features = false features = ["alloc"] [dependencies.rand_xorshift] -version = "0.2" +version = "0.3" [dependencies.rand_chacha] -version = "0.2" +version = "0.3" default-features = false [dependencies.byteorder] diff --git a/proptest/src/char.rs b/proptest/src/char.rs index c957ec71..043394a3 100644 --- a/proptest/src/char.rs +++ b/proptest/src/char.rs @@ -114,16 +114,16 @@ fn select_range_index( } if !special.is_empty() && rnd.gen() { - let s = special[rnd.gen_range(0, special.len())]; + let s = special[rnd.gen_range(0..special.len())]; if let Some(ret) = in_range(ranges, s) { return ret; } } if !preferred.is_empty() && rnd.gen() { - let range = preferred[rnd.gen_range(0, preferred.len())].clone(); + let range = preferred[rnd.gen_range(0..preferred.len())].clone(); if let Some(ch) = ::core::char::from_u32( - rnd.gen_range(*range.start() as u32, *range.end() as u32 + 1), + rnd.gen_range(*range.start() as u32 .. *range.end() as u32 + 1), ) { if let Some(ret) = in_range(ranges, ch) { return ret; @@ -132,9 +132,9 @@ fn select_range_index( } for _ in 0..65_536 { - let range = ranges[rnd.gen_range(0, ranges.len())].clone(); + let range = ranges[rnd.gen_range(0..ranges.len())].clone(); if let Some(ch) = ::core::char::from_u32( - rnd.gen_range(*range.start() as u32, *range.end() as u32 + 1), + rnd.gen_range(*range.start() as u32 .. *range.end() as u32 + 1), ) { return (*range.start() as u32, ch as u32 - *range.start() as u32); } diff --git a/proptest/src/strategy/shuffle.rs b/proptest/src/strategy/shuffle.rs index 274dabb3..d772a481 100644 --- a/proptest/src/strategy/shuffle.rs +++ b/proptest/src/strategy/shuffle.rs @@ -170,7 +170,7 @@ where // Determine the other index to be swapped, then skip the swap if // it is too far. This ordering is critical, as it ensures that we // generate the same sequence of random numbers every time. - let end_index = rng.gen_range(start_index + 1, len); + let end_index = rng.gen_range(start_index + 1 .. len); if end_index - start_index <= max_swap { value.shuffle_swap(start_index, end_index); }