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

rustup

Cc https://github.com/rust-lang/rust/issues/99224
This commit is contained in:
bors 2022-07-14 11:59:46 +00:00
commit 6f6e01ef3b
4 changed files with 3 additions and 9 deletions

View File

@ -1 +1 @@
c396bb3b8a16b1f2762b7c6078dc3e023f6a2493
cbb07c27a4d78f95557a6b9cdcc32f98d67a0c22

View File

@ -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();
}

View File

@ -1,5 +1,3 @@
#![feature(untagged_unions)]
#[repr(C)]
#[derive(Clone, Copy)]
struct Pair<T, U>(T, U);

View File

@ -1,5 +1,3 @@
#![feature(untagged_unions)]
fn main() {
a();
b();
@ -22,6 +20,7 @@ union U {
}
fn b() {
#[derive(Copy, Clone)]
struct S {
x: u32,
y: u32,