diff options
| author | bors <bors@rust-lang.org> | 2020-06-12 13:10:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-12 13:10:57 +0000 |
| commit | 7c78a5f97de07a185eebae5a5de436c80d8ba9d4 (patch) | |
| tree | e5475f282387bca43e2085d44537fdfbe69ef98d /src/libstd/sync | |
| parent | 59493917be3e87e1dfb44a9ccb66a9f9b17228e6 (diff) | |
| parent | 77ede48ada25295cb90e520f52c1cbe653982f8a (diff) | |
| download | rust-7c78a5f97de07a185eebae5a5de436c80d8ba9d4.tar.gz rust-7c78a5f97de07a185eebae5a5de436c80d8ba9d4.zip | |
Auto merge of #73276 - Dylan-DPC:rollup-hfd81qw, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #72906 (Migrate to numeric associated consts) - #73178 (expand: More precise locations for expansion-time lints) - #73225 (Allow inference regions when relating consts) - #73236 (Clean up E0666 explanation) - #73273 (Fix Zulip pings) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/condvar.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 77e521eae9a..2250c0d4203 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -609,7 +609,6 @@ mod tests { use crate::sync::{Arc, Condvar, Mutex}; use crate::thread; use crate::time::Duration; - use crate::u64; #[test] fn smoke() { diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index e70204d6839..d6cc811154f 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -2176,8 +2176,7 @@ mod tests { #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 fn very_long_recv_timeout_wont_panic() { let (tx, rx) = channel::<()>(); - let join_handle = - thread::spawn(move || rx.recv_timeout(Duration::from_secs(u64::max_value()))); + let join_handle = thread::spawn(move || rx.recv_timeout(Duration::from_secs(u64::MAX))); thread::sleep(Duration::from_secs(1)); assert!(tx.send(()).is_ok()); assert_eq!(join_handle.join().unwrap(), Ok(())); |