Auto merge of rust-lang#2371 - RalfJung:rustup, r=RalfJung

rustup Cc rust-lang#99224
rust-lang-ci · Jul 14, 2022 · 6f6e01e · 6f6e01e
2 parents af2c50f + 11f2b83
commit 6f6e01e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c396bb3b8a16b1f2762b7c6078dc3e023f6a2493
+cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22
diff --git 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();
 }
diff --git 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>(T, U);

diff --git 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,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c396bb3b8a16b1f2762b7c6078dc3e023f6a2493
		cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22