Skip to content

Rollup of 4 pull requests #70568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 14 commits into from
Mar 30, 2020
Merged

Rollup of 4 pull requests #70568

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a1e61e
avoid creating unnecessary reference in Windows Env iterator
RalfJung Mar 27, 2020
df1ac67
update polonius-engine to 0.12.1
lqd Mar 29, 2020
860f71f
Polonius fact generation: fix path access fact location
lqd Mar 29, 2020
2a76447
bless output of ui test hrtb/hrtb-perfect-forwarding.rs
lqd Mar 29, 2020
c73d5db
bless output of ui test nll/outlives-suggestion-simple.rs
lqd Mar 29, 2020
fcd12bd
bless output of ui test closures/closure-expected-type/expect-region-…
lqd Mar 29, 2020
8242463
bless output of ui test impl-trait/multiple-lifetimes/error-handling.rs
lqd Mar 29, 2020
5af11d2
bless output of ui test nll/user-annotations/closure-substs.rs
lqd Mar 29, 2020
032d3cd
fix BTreeMap test compilation with Miri
RalfJung Mar 30, 2020
60e7473
Fix broken link in README
JOE1994 Mar 30, 2020
47ffca2
Rollup merge of #70479 - RalfJung:win-env, r=Mark-Simulacrum
Dylan-DPC Mar 30, 2020
b99db6e
Rollup merge of #70546 - lqd:polonius_update, r=nikomatsakis
Dylan-DPC Mar 30, 2020
298a89b
Rollup merge of #70559 - RalfJung:btree-test-miri, r=Mark-Simulacrum
Dylan-DPC Mar 30, 2020
aaa8aa3
Rollup merge of #70567 - JOE1994:patch-3, r=Centril
Dylan-DPC Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix BTreeMap test compilation with Miri
  • Loading branch information
@RalfJung
RalfJung committed Mar 30, 2020
commit 032d3cd553ec503a4483c8ef1f2a8d773775a3f2
2 changes: 1 addition & 1 deletion src/liballoc/tests/btree/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>) {
Expand Down