From bd69a92b4b794bde4900385d6befaf644accb496 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 13 Jul 2022 22:35:45 -0400 Subject: [PATCH 1/2] rustup --- rust-version | 2 +- tests/pass/union-overwrite.rs | 2 -- tests/pass/union.rs | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rust-version b/rust-version index 2a26cb608235..3b418bcb11d1 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c396bb3b8a16b1f2762b7c6078dc3e023f6a2493 +cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22 diff --git a/tests/pass/union-overwrite.rs b/tests/pass/union-overwrite.rs index d3c81834bc4b..f1d3d9d48101 100644 --- a/tests/pass/union-overwrite.rs +++ b/tests/pass/union-overwrite.rs @@ -1,5 +1,3 @@ -#![feature(untagged_unions)] - #[repr(C)] #[derive(Clone, Copy)] struct Pair(T, U); diff --git a/tests/pass/union.rs b/tests/pass/union.rs index f98a21310285..8a6dd49f4503 100644 --- a/tests/pass/union.rs +++ b/tests/pass/union.rs @@ -1,5 +1,3 @@ -#![feature(untagged_unions)] - fn main() { a(); b(); @@ -22,6 +20,7 @@ fn a() { } fn b() { + #[derive(Copy, Clone)] struct S { x: u32, y: u32, From 11f2b834648bb07ce64c1dcd3c4b7dd0252ab9bb Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 14 Jul 2022 07:29:20 -0400 Subject: [PATCH 2/2] fix a missing thread join --- tests/pass/concurrency/sync.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/pass/concurrency/sync.rs b/tests/pass/concurrency/sync.rs index b7e6f229faae..64bd7ebb27fd 100644 --- a/tests/pass/concurrency/sync.rs +++ b/tests/pass/concurrency/sync.rs @@ -219,10 +219,8 @@ fn park_unpark() { // know Miri's timed synchronization primitives do not do that. assert!((200..1000).contains(&start.elapsed().as_millis())); -} -fn check_condvar() { - let _ = std::sync::Condvar::new(); + t2.join().unwrap(); } fn main() { @@ -236,5 +234,4 @@ fn main() { check_once(); park_timeout(); park_unpark(); - check_condvar(); }