Use more precise unsafe scopes

crossbeam-rs · Feb 11, 2020 · 8903df8 · 8903df8
1 parent 8abcc14
commit 8903df8
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/crossbeam-epoch/src/sync/queue.rs b/crossbeam-epoch/src/sync/queue.rs
@@ -142,24 +142,22 @@ impl<T> Queue<T> {
         let head = self.head.load(Acquire, guard);
         let h = unsafe { head.deref() };
         let next = h.next.load(Acquire, guard);
-        unsafe {
-            match next.as_ref() {
-                Some(n) if condition(&*n.data.as_ptr()) => {
-                    self.head
-                        .compare_and_set(head, next, Release, guard)
-                        .map(|_| {
-                            let tail = self.tail.load(Relaxed, guard);
-                            // Advance the tail so that we don't retire a pointer to a reachable node.
-                            if head == tail {
-                                let _ = self.tail.compare_and_set(tail, next, Release, guard);
-                            }
-                            guard.defer_destroy(head);
-                            Some(n.data.as_ptr().read())
-                        })
-                        .map_err(|_| ())
-                }
-                None | Some(_) => Ok(None),
-            }
+        match unsafe { next.as_ref() } {
+            Some(n) if condition(unsafe { &*n.data.as_ptr() }) => unsafe {
+                self.head
+                    .compare_and_set(head, next, Release, guard)
+                    .map(|_| {
+                        let tail = self.tail.load(Relaxed, guard);
+                        // Advance the tail so that we don't retire a pointer to a reachable node.
+                        if head == tail {
+                            let _ = self.tail.compare_and_set(tail, next, Release, guard);
+                        }
+                        guard.defer_destroy(head);
+                        Some(n.data.as_ptr().read())
+                    })
+                    .map_err(|_| ())
+            },
+            None | Some(_) => Ok(None),
         }
     }