diff options
| author | bors <bors@rust-lang.org> | 2023-07-05 20:53:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-05 20:53:38 +0000 |
| commit | d9c13cd4531649c2028a8384cb4d4e54f985380e (patch) | |
| tree | b91d20edf3807876ad341fe83de159e2a1225825 | |
| parent | 5dac6b320be868f898a3c753934eabc79ff2e406 (diff) | |
| parent | e1338cc254fb0802197cbd67e62bbf1133ab330a (diff) | |
| download | rust-d9c13cd4531649c2028a8384cb4d4e54f985380e.tar.gz rust-d9c13cd4531649c2028a8384cb4d4e54f985380e.zip | |
Auto merge of #113287 - RalfJung:miri-test-libstd, r=JohnTitor
enable test_join test in Miri Miri for quite a while now has a hack to support self-referential generators: non-`Unique` mutable references are exempt from aliasing conditions. So we can run this test now. (It passes.) Also extend a comment in a Vec test, while I am at it.
| -rw-r--r-- | library/alloc/tests/vec.rs | 1 | ||||
| -rw-r--r-- | library/core/tests/future.rs | 1 |
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; |