diff options
| author | bors <bors@rust-lang.org> | 2019-07-05 11:53:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-05 11:53:52 +0000 |
| commit | 853f30052d019a8ebe197a5adff3a29d6716a955 (patch) | |
| tree | edea92c0e1ce6501e5c23fd5d9c2874f15623d79 /src/libstd/sync | |
| parent | f119bf2761ab11ca577fac9881678c04d3e7fdb0 (diff) | |
| parent | 18081890ea7c4f3cb38d51be5ddea4f51dc262c3 (diff) | |
| download | rust-853f30052d019a8ebe197a5adff3a29d6716a955.tar.gz rust-853f30052d019a8ebe197a5adff3a29d6716a955.zip | |
Auto merge of #62407 - Centril:rollup-g0zmff7, r=Centril
Rollup of 10 pull requests
Successful merges:
- #62123 ( Remove needless lifetimes (std))
- #62150 (Implement mem::{zeroed,uninitialized} in terms of MaybeUninit.)
- #62169 (Derive which queries to save using the proc macro)
- #62238 (Fix code block information icon position)
- #62292 (Move `async || ...` closures into `#![feature(async_closure)]`)
- #62323 (Clarify unaligned fields in ptr::{read,write}_unaligned)
- #62324 (Reduce reliance on `await!(...)` macro)
- #62371 (Add tracking issue for Box::into_pin)
- #62383 (Improve error span for async type inference error)
- #62388 (Break out of the correct number of scopes in loops)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index f8fcd3ff5a5..fbe36d10517 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -140,7 +140,7 @@ fn wait_timeout_receiver<'a, 'b, T>(lock: &'a Mutex<State<T>>, new_guard } -fn abort_selection<'a, T>(guard: &mut MutexGuard<'a , State<T>>) -> bool { +fn abort_selection<T>(guard: &mut MutexGuard<'_, State<T>>) -> bool { match mem::replace(&mut guard.blocker, NoneBlocked) { NoneBlocked => true, BlockedSender(token) => { |
