Merge #974

974: Sync with v0.8 branch r=taiki-e a=taiki-e Co-authored-by: Taiki Endo <te316e89@gmail.com>
crossbeam-rs · Apr 9, 2023 · 94e0400 · 94e0400
2 parents 5b7499b + 9515bd1
commit 94e0400
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/crossbeam-channel/CHANGELOG.md b/crossbeam-channel/CHANGELOG.md
@@ -1,17 +1,29 @@
+# Version 0.5.8
+
+- Fix race condition in unbounded channel. (#972)
+
 # Version 0.5.7
 
+**Note:** This release has been yanked due to bug fixed in 0.5.8.
+
 - Improve handling of very large timeout. (#953)
 
 # Version 0.5.6
 
+**Note:** This release has been yanked due to bug fixed in 0.5.8.
+
 - Bump the minimum supported Rust version to 1.38. (#877)
 
 # Version 0.5.5
 
+**Note:** This release has been yanked due to bug fixed in 0.5.8.
+
 - Replace Spinlock with Mutex. (#835)
 
 # Version 0.5.4
 
+**Note:** This release has been yanked due to bug fixed in 0.5.8.
+
 - Workaround a bug in upstream related to TLS access on AArch64 Linux. (#802)
 
 # Version 0.5.3
@@ -28,6 +40,8 @@
 
 # Version 0.5.1
 
+**Note:** This release has been yanked due to bug fixed in 0.5.8.
+
 - Fix memory leak in unbounded channel. (#669)
 
 # Version 0.5.0

diff --git a/crossbeam-channel/Cargo.toml b/crossbeam-channel/Cargo.toml
@@ -4,7 +4,7 @@ name = "crossbeam-channel"
 # - Update CHANGELOG.md
 # - Update README.md
 # - Create "crossbeam-channel-X.Y.Z" git tag
-version = "0.5.7"
+version = "0.5.8"
 edition = "2018"
 rust-version = "1.38"
 license = "MIT OR Apache-2.0"

diff --git a/crossbeam-channel/tests/same_channel.rs b/crossbeam-channel/tests/same_channel.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::redundant_clone)]
+
 use std::time::Duration;
 
 use crossbeam_channel::{after, bounded, never, tick, unbounded};

diff --git a/crossbeam-queue/src/array_queue.rs b/crossbeam-queue/src/array_queue.rs
@@ -528,9 +528,9 @@ impl<T> Iterator for IntoIter<T> {
                 lap.wrapping_add(value.one_lap)
             };
             *value.head.get_mut() = new;
-            Option::Some(val)
+            Some(val)
         } else {
-            Option::None
+            None
         }
     }
 }