Merge branch 'master' into priroda

7 files changed, 3 insertions, 18 deletions

diff --git a/tests/compile-fail/memleak_rc.rs b/tests/compile-fail/memleak_rc.rs
index ee245daa310..b2bc6722afb 100644
--- a/tests/compile-fail/memleak_rc.rs
+++ b/tests/compile-fail/memleak_rc.rs
@@ -1,6 +1,3 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
-// compile-flags: -Zmir-emit-validate=0
-
 //error-pattern: the evaluated program leaked memory
 
 use std::rc::Rc;
diff --git a/tests/compile-fail/panic.rs b/tests/compile-fail/panic.rs
index dbe80fecd00..4247cdaa463 100644
--- a/tests/compile-fail/panic.rs
+++ b/tests/compile-fail/panic.rs
@@ -1,6 +1,5 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
+// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
 // compile-flags: -Zmir-emit-validate=0
-
 //error-pattern: the evaluated program panicked
 
 fn main() {
diff --git a/tests/compile-fail/zst2.rs b/tests/compile-fail/zst2.rs
index 0c46acb8ade..fa4ae9afdf6 100644
--- a/tests/compile-fail/zst2.rs
+++ b/tests/compile-fail/zst2.rs
@@ -1,6 +1,5 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
+// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
 // compile-flags: -Zmir-emit-validate=0
-
 // error-pattern: the evaluated program panicked
 
 #[derive(Debug)]
diff --git a/tests/compile-fail/zst3.rs b/tests/compile-fail/zst3.rs
index a6d7fdd3552..320541552fb 100644
--- a/tests/compile-fail/zst3.rs
+++ b/tests/compile-fail/zst3.rs
@@ -1,6 +1,5 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
+// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
 // compile-flags: -Zmir-emit-validate=0
-
 // error-pattern: the evaluated program panicked
 
 #[derive(Debug)]
diff --git a/tests/run-pass/rc.rs b/tests/run-pass/rc.rs
index ba1ef6d7043..c6de3675abe 100644
--- a/tests/run-pass/rc.rs
+++ b/tests/run-pass/rc.rs
@@ -1,6 +1,3 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
-// compile-flags: -Zmir-emit-validate=0
-
 use std::cell::RefCell;
 use std::rc::Rc;
 
diff --git a/tests/run-pass/send-is-not-static-par-for.rs b/tests/run-pass/send-is-not-static-par-for.rs
index 19ff4b30db1..4ac1b5436f5 100644
--- a/tests/run-pass/send-is-not-static-par-for.rs
+++ b/tests/run-pass/send-is-not-static-par-for.rs
@@ -10,9 +10,6 @@
 
 //ignore-windows
 
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
-// compile-flags: -Zmir-emit-validate=0
-
 use std::sync::Mutex;
 
 fn par_for<I, F>(iter: I, f: F)
diff --git a/tests/run-pass/std.rs b/tests/run-pass/std.rs
index b15307bb48d..e0e23812d27 100644
--- a/tests/run-pass/std.rs
+++ b/tests/run-pass/std.rs
@@ -1,6 +1,3 @@
-// FIXME: Due to https://github.com/rust-lang/rust/issues/43457 we have to disable validation
-// compile-flags: -Zmir-emit-validate=0
-
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
 use std::sync::Arc;