about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-06-08 20:35:59 +0200
committerRalf Jung <post@ralfj.de>2019-06-08 20:35:59 +0200
commit3f99ad175a745bcb49eeef64675f1fa48d84016d (patch)
tree0f0660f7681d2a10da31b1235a87d4fd1b5851ec
parenta733b876f7831d2273826753841194b4ba2a5260 (diff)
downloadrust-3f99ad175a745bcb49eeef64675f1fa48d84016d.tar.gz
rust-3f99ad175a745bcb49eeef64675f1fa48d84016d.zip
extra paranoid mode
-rw-r--r--src/test/run-pass/consts/const-ptr-nonnull.rs5
-rw-r--r--src/test/run-pass/consts/const-ptr-unique.rs3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/test/run-pass/consts/const-ptr-nonnull.rs b/src/test/run-pass/consts/const-ptr-nonnull.rs
index 12a5ea5b480..67d52ad0824 100644
--- a/src/test/run-pass/consts/const-ptr-nonnull.rs
+++ b/src/test/run-pass/consts/const-ptr-nonnull.rs
@@ -11,6 +11,7 @@ const DANGLING: NonNull<u32> = NonNull::dangling();
 const CASTED: NonNull<u32> = NonNull::cast(NonNull::<i32>::dangling());
 
 pub fn main() {
-    assert_eq!(DANGLING, b(NonNull::dangling)());
-    assert_eq!(CASTED, b(NonNull::dangling)());
+    // Be super-extra paranoid and cast the fn items to fn pointers before blackboxing them.
+    assert_eq!(DANGLING, b::<fn() -> _>(NonNull::dangling)());
+    assert_eq!(CASTED, b::<fn() -> _>(NonNull::dangling)());
 }
diff --git a/src/test/run-pass/consts/const-ptr-unique.rs b/src/test/run-pass/consts/const-ptr-unique.rs
index be3ea193fa4..e8735e1a32c 100644
--- a/src/test/run-pass/consts/const-ptr-unique.rs
+++ b/src/test/run-pass/consts/const-ptr-unique.rs
@@ -11,5 +11,6 @@ use std::ptr::Unique;
 const PTR: *mut u32 = Unique::empty().as_ptr();
 
 pub fn main() {
-    assert_eq!(PTR, b(Unique::<u32>::empty)().as_ptr());
+    // Be super-extra paranoid and cast the fn items to fn pointers before blackboxing them.
+    assert_eq!(PTR, b::<fn() -> _>(Unique::<u32>::empty)().as_ptr());
 }