diff options
| author | bors <bors@rust-lang.org> | 2020-03-30 14:25:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-30 14:25:34 +0000 |
| commit | 9a12971da5c08f9a95d54bdaef5cd83698ed4509 (patch) | |
| tree | 022e54b66a564f036d464627f7b6112c63aeb5af /src/liballoc | |
| parent | a80ec3b3b1d11ed83754885efdd07037d256dbf2 (diff) | |
| parent | aaa8aa31814dc33b98cb790d337b12d907e9b12c (diff) | |
| download | rust-9a12971da5c08f9a95d54bdaef5cd83698ed4509.tar.gz rust-9a12971da5c08f9a95d54bdaef5cd83698ed4509.zip | |
Auto merge of #70568 - Dylan-DPC:rollup-em6vnpx, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #70479 (avoid creating unnecessary reference in Windows Env iterator) - #70546 (Polonius: update to 0.12.1, fix more move errors false positives, update test expectations) - #70559 (fix BTreeMap test compilation with Miri) - #70567 (Fix broken link in README) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/tests/btree/map.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs index 535b6a9c314..e28b71510ce 100644 --- a/src/liballoc/tests/btree/map.rs +++ b/src/liballoc/tests/btree/map.rs @@ -528,7 +528,7 @@ fn test_range_1000() { #[cfg(not(miri))] // Miri is too slow let size = 1000; #[cfg(miri)] - let size = MIN_INSERTS_HEIGHT_2; + let size = MIN_INSERTS_HEIGHT_2 as u32; let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect(); fn test(map: &BTreeMap<u32, u32>, size: u32, min: Bound<&u32>, max: Bound<&u32>) { |