about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-03-30 16:24:51 +0200
committerGitHub <noreply@github.com>2020-03-30 16:24:51 +0200
commit298a89bff380d5968c4e8753cdfd4c97ac43262a (patch)
tree115ec5703346b0591e1dc204dc65909a022a4a0d /src/liballoc
parentb99db6ee10854b4740b708176f8f87835ea8babb (diff)
parent032d3cd553ec503a4483c8ef1f2a8d773775a3f2 (diff)
downloadrust-298a89bff380d5968c4e8753cdfd4c97ac43262a.tar.gz
rust-298a89bff380d5968c4e8753cdfd4c97ac43262a.zip
Rollup merge of #70559 - RalfJung:btree-test-miri, r=Mark-Simulacrum
fix BTreeMap test compilation with Miri

This got broken by https://github.com/rust-lang/rust/pull/70506
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/tests/btree/map.rs2
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>) {