mirror of https://github.com/rust-lang/rust.git
Auto merge of #2551 - RalfJung:rustup, r=RalfJung
rustup Cc https://github.com/rust-lang/rust/issues/101867
This commit is contained in:
commit
4b9463c5b7
|
@ -1,4 +1,3 @@
|
|||
#![feature(let_else)]
|
||||
#![allow(clippy::useless_format, clippy::derive_partial_eq_without_eq, rustc::internal)]
|
||||
|
||||
#[macro_use]
|
||||
|
|
|
@ -1 +1 @@
|
|||
5197c96c49fc3b7de3ce9a31f7cc62d2cbd1f70c
|
||||
2019147c5642c08cdb9ad4cacd97dd1fa4ffa701
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#![feature(map_try_insert)]
|
||||
#![feature(never_type)]
|
||||
#![feature(try_blocks)]
|
||||
#![feature(let_else)]
|
||||
#![feature(io_error_more)]
|
||||
#![feature(int_log)]
|
||||
#![feature(variant_count)]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::time::SystemTime;
|
||||
|
||||
use rustc_hir::LangItem;
|
||||
use rustc_middle::ty::{layout::TyAndLayout, query::TyCtxtAt, subst::Subst, Ty};
|
||||
use rustc_middle::ty::{layout::TyAndLayout, query::TyCtxtAt, Ty};
|
||||
|
||||
use crate::concurrency::thread::Time;
|
||||
use crate::*;
|
||||
|
|
|
@ -81,7 +81,7 @@ fn check_conditional_variables_timed_wait_notimeout() {
|
|||
cvar.notify_one();
|
||||
});
|
||||
|
||||
let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(500)).unwrap();
|
||||
let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(1000)).unwrap();
|
||||
assert!(!timeout.timed_out());
|
||||
handle.join().unwrap();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue