Merge #55

55: install Miri via rustup r=Amanieu a=RalfJung Co-authored-by: Ralf Jung <post@ralfj.de>
rust-lang · Mar 26, 2019 · 91d3e4a · 91d3e4a
2 parents edf79d0 + 49a9d6c
commit 91d3e4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ci/miri.sh b/ci/miri.sh
@@ -5,7 +5,7 @@ set -ex
 export CARGO_NET_RETRY=5
 export CARGO_NET_TIMEOUT=10
 
-if cargo install --force --git https://github.com/rust-lang/miri miri ; then
+if rustup component add miri ; then
     cargo miri setup
-    cargo miri test
+    cargo miri test -- -- -Zunstable-options --exclude-should-panic
 fi
diff --git a/src/map.rs b/src/map.rs
@@ -3219,7 +3219,6 @@ mod test_map {
 
     #[test]
     #[should_panic]
-    #[cfg(not(miri))] // FIXME: https://github.com/rust-lang/miri/issues/636
     fn test_index_nonexistent() {
         let mut map = HashMap::new();