Skip to content

Commit a2287c4

Browse files
committed
Merge commit 'refs/pull/220/head' of github.com:altsysrq/proptest into 1.0.0-changes
2 parents a4d3e96 + e52c7a5 commit a2287c4

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ environment:
44
- TARGET: nightly-i686-pc-windows-msvc
55
- TARGET: nightly-x86_64-pc-windows-gnu
66
- TARGET: nightly-i686-pc-windows-gnu
7-
- TARGET: 1.32.0-x86_64-pc-windows-gnu
7+
- TARGET: 1.36.0-x86_64-pc-windows-gnu
88
install:
99
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe"
1010
- ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null

proptest/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ version = "0.5.0"
9595
optional = true
9696

9797
[dependencies.rand]
98-
version = "0.7"
98+
version = "0.8"
9999
default-features = false
100100
features = ["alloc"]
101101

102102
[dependencies.rand_xorshift]
103-
version = "0.2"
103+
version = "0.3"
104104

105105
[dependencies.rand_chacha]
106-
version = "0.2"
106+
version = "0.3"
107107
default-features = false
108108

109109
[dependencies.byteorder]

proptest/src/char.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ fn select_range_index(
114114
}
115115

116116
if !special.is_empty() && rnd.gen() {
117-
let s = special[rnd.gen_range(0, special.len())];
117+
let s = special[rnd.gen_range(0..special.len())];
118118
if let Some(ret) = in_range(ranges, s) {
119119
return ret;
120120
}
121121
}
122122

123123
if !preferred.is_empty() && rnd.gen() {
124-
let range = preferred[rnd.gen_range(0, preferred.len())].clone();
124+
let range = preferred[rnd.gen_range(0..preferred.len())].clone();
125125
if let Some(ch) = ::core::char::from_u32(
126-
rnd.gen_range(*range.start() as u32, *range.end() as u32 + 1),
126+
rnd.gen_range(*range.start() as u32 .. *range.end() as u32 + 1),
127127
) {
128128
if let Some(ret) = in_range(ranges, ch) {
129129
return ret;
@@ -132,9 +132,9 @@ fn select_range_index(
132132
}
133133

134134
for _ in 0..65_536 {
135-
let range = ranges[rnd.gen_range(0, ranges.len())].clone();
135+
let range = ranges[rnd.gen_range(0..ranges.len())].clone();
136136
if let Some(ch) = ::core::char::from_u32(
137-
rnd.gen_range(*range.start() as u32, *range.end() as u32 + 1),
137+
rnd.gen_range(*range.start() as u32 .. *range.end() as u32 + 1),
138138
) {
139139
return (*range.start() as u32, ch as u32 - *range.start() as u32);
140140
}

proptest/src/strategy/shuffle.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ where
170170
// Determine the other index to be swapped, then skip the swap if
171171
// it is too far. This ordering is critical, as it ensures that we
172172
// generate the same sequence of random numbers every time.
173-
let end_index = rng.gen_range(start_index + 1, len);
173+
let end_index = rng.gen_range(start_index + 1 .. len);
174174
if end_index - start_index <= max_swap {
175175
value.shuffle_swap(start_index, end_index);
176176
}

0 commit comments

Comments
 (0)