Merge pull request #28 from taiki-e/compare_and_swap

Replace deprecated compare_and_swap with compare_exchange
smol-rs · Dec 24, 2020 · 4e32cca · 4e32cca
2 parents 14c8d34 + c009653
commit 4e32cca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -421,9 +421,10 @@ impl Poller {
     /// ```
     pub fn notify(&self) -> io::Result<()> {
         log::trace!("Poller::notify()");
-        if !self
+        if self
             .notified
-            .compare_and_swap(false, true, Ordering::SeqCst)
+            .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
+            .is_ok()
         {
             self.poller.notify()?;
         }

diff --git a/src/wepoll.rs b/src/wepoll.rs
@@ -115,9 +115,10 @@ impl Poller {
     pub fn notify(&self) -> io::Result<()> {
         log::trace!("notify: handle={:?}", self.handle);
 
-        if !self
+        if self
             .notified
-            .compare_and_swap(false, true, Ordering::SeqCst)
+            .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
+            .is_ok()
         {
             unsafe {
                 // This call errors if a notification has already been posted, but that's okay - we