diff options
| author | bors <bors@rust-lang.org> | 2020-07-02 23:18:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-02 23:18:15 +0000 |
| commit | 5f4abc16e1b2cb035eee6a5079ce45ce924c1f33 (patch) | |
| tree | 327e15fe3a91f01c5b4cf23b2a31366b384e97bd /src/liballoc | |
| parent | 3503f565e1fb7296983757d2716346f48a4a262b (diff) | |
| parent | 7bd2f97cb61d4578ac55d54bfdfc7c4ade752374 (diff) | |
| download | rust-5f4abc16e1b2cb035eee6a5079ce45ce924c1f33.tar.gz rust-5f4abc16e1b2cb035eee6a5079ce45ce924c1f33.zip | |
Auto merge of #73977 - Manishearth:rollup-2x4s7c6, r=Manishearth
Rollup of 8 pull requests Successful merges: - #73454 (Move contributing.md to rustc-dev-guide and point at getting started) - #73724 (Use WASM's saturating casts if they are available) - #73726 (resolve: disallow labelled breaks/continues through closures/async blocks) - #73753 (Use 'tcx for references to AccessLevels wherever possible.) - #73781 (Update psm version) - #73952 (Add option for local docker testing.) - #73957 (disable BTree min_max test in Miri for now) - #73975 (Document rustc_ast::ast::Pat) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/tests/btree/map.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs index 682d829d219..f66b5814ca0 100644 --- a/src/liballoc/tests/btree/map.rs +++ b/src/liballoc/tests/btree/map.rs @@ -310,6 +310,7 @@ fn test_iter_mixed() { } #[test] +#[cfg_attr(miri, ignore)] // FIXME: fails in Miri <https://github.com/rust-lang/rust/issues/73915> fn test_iter_min_max() { let mut a = BTreeMap::new(); assert_eq!(a.iter().min(), None); |