about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorThinkChaos <ThinkChaos@users.noreply.github.com>2020-04-21 21:11:32 +0200
committerThinkChaos <ThinkChaos@users.noreply.github.com>2020-04-26 11:50:53 +0200
commit4ea83bfb3d457770f2e54965dd86f672fbbc87c2 (patch)
tree7ee08d8b991be7406bb3cd706ea767b51d187643 /src/libstd/sync
parentf121f094fe4d4f4e92142984e9230373c311e1e6 (diff)
downloadrust-4ea83bfb3d457770f2e54965dd86f672fbbc87c2.tar.gz
rust-4ea83bfb3d457770f2e54965dd86f672fbbc87c2.zip
Use Cell::take in a couple places
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/once.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
index 1e6b6c430be..a3ee14e85d2 100644
--- a/src/libstd/sync/once.rs
+++ b/src/libstd/sync/once.rs
@@ -497,7 +497,7 @@ impl Drop for WaiterQueue<'_> {
             let mut queue = (state_and_queue & !STATE_MASK) as *const Waiter;
             while !queue.is_null() {
                 let next = (*queue).next;
-                let thread = (*queue).thread.replace(None).unwrap();
+                let thread = (*queue).thread.take().unwrap();
                 (*queue).signaled.store(true, Ordering::Release);
                 // ^- FIXME (maybe): This is another case of issue #55005
                 // `store()` has a potentially dangling ref to `signaled`.