about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2023-07-03 14:05:55 +0200
committerRalf Jung <post@ralfj.de>2023-07-03 14:05:55 +0200
commite1338cc254fb0802197cbd67e62bbf1133ab330a (patch)
treeb223451ac3baf39130c0b996d75a537b42e29ff1
parent737b4615552741aefcd10124914355392b6b3d80 (diff)
downloadrust-e1338cc254fb0802197cbd67e62bbf1133ab330a.tar.gz
rust-e1338cc254fb0802197cbd67e62bbf1133ab330a.zip
enable test_join test in Miri
-rw-r--r--library/alloc/tests/vec.rs1
-rw-r--r--library/core/tests/future.rs1
2 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/tests/vec.rs b/library/alloc/tests/vec.rs
index 21824c8a17c..ddd93e9a436 100644
--- a/library/alloc/tests/vec.rs
+++ b/library/alloc/tests/vec.rs
@@ -1906,6 +1906,7 @@ fn test_stable_pointers() {
     assert_eq!(*v0, 13);
 
     // Smoke test that would fire even outside Miri if an actual relocation happened.
+    // Also ensures the pointer is still writeable after all this.
     *v0 -= 13;
     assert_eq!(v[0], 0);
 }
diff --git a/library/core/tests/future.rs b/library/core/tests/future.rs
index 74b6f74e401..db417256dd0 100644
--- a/library/core/tests/future.rs
+++ b/library/core/tests/future.rs
@@ -30,7 +30,6 @@ fn poll_n(val: usize, num: usize) -> PollN {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)] // self-referential generators do not work with Miri's aliasing checks
 fn test_join() {
     block_on(async move {
         let x = join!(async { 0 }).await;