Merge pull request #53 from terrarier2111/master

Amanieu · May 12, 2023 · e5c3757 · e5c3757
2 parents 7b393ef + c84f449
commit e5c3757
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
         with:
           components: rustfmt
       - run: cargo fmt -- --check

diff --git a/src/lib.rs b/src/lib.rs
@@ -384,14 +384,16 @@ impl RawIter {
             let bucket = unsafe { thread_local.buckets.get_unchecked(self.bucket) };
             let bucket = bucket.load(Ordering::Acquire);
 
-            if !bucket.is_null() {
-                while self.index < self.bucket_size {
-                    let entry = unsafe { &*bucket.add(self.index) };
-                    self.index += 1;
-                    if entry.present.load(Ordering::Acquire) {
-                        self.yielded += 1;
-                        return Some(unsafe { &*(&*entry.value.get()).as_ptr() });
-                    }
+            if bucket.is_null() {
+                return None;
+            }
+
+            while self.index < self.bucket_size {
+                let entry = unsafe { &*bucket.add(self.index) };
+                self.index += 1;
+                if entry.present.load(Ordering::Acquire) {
+                    self.yielded += 1;
+                    return Some(unsafe { &*(&*entry.value.get()).as_ptr() });
                 }
             }
 
@@ -411,14 +413,16 @@ impl RawIter {
             let bucket = unsafe { thread_local.buckets.get_unchecked_mut(self.bucket) };
             let bucket = *bucket.get_mut();
 
-            if !bucket.is_null() {
-                while self.index < self.bucket_size {
-                    let entry = unsafe { &mut *bucket.add(self.index) };
-                    self.index += 1;
-                    if *entry.present.get_mut() {
-                        self.yielded += 1;
-                        return Some(entry);
-                    }
+            if bucket.is_null() {
+                return None;
+            }
+
+            while self.index < self.bucket_size {
+                let entry = unsafe { &mut *bucket.add(self.index) };
+                self.index += 1;
+                if *entry.present.get_mut() {
+                    self.yielded += 1;
+                    return Some(entry);
                 }
             }