v0.8: Prepare for the next release

Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam <version>'
 version = "0.8.4"
 edition = "2021"
 rust-version = "1.61"

crossbeam-channel/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.5.12
+
+- Fix memory leak in unbounded channel. (#1084)
+
 # Version 0.5.11
 
 - Remove dependency on `cfg-if`. (#1072)

crossbeam-channel/Cargo.toml

@@ -2,9 +2,9 @@
 name = "crossbeam-channel"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-channel-X.Y.Z" git tag
-version = "0.5.11"
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-channel <version>'
+version = "0.5.12"
 edition = "2021"
 rust-version = "1.60"
 license = "MIT OR Apache-2.0"

crossbeam-channel/src/context.rs

@@ -41,7 +41,7 @@ impl Context {
     where
         F: FnOnce(&Context) -> R,
     {
-        thread_local! {
+        std::thread_local! {
             /// Cached thread-local context.
             static CONTEXT: Cell<Option<Context>> = Cell::new(Some(Context::new()));
         }

crossbeam-channel/src/counter.rs

@@ -1,5 +1,6 @@
 //! Reference counter for channels.
 
+use std::boxed::Box;
 use std::isize;
 use std::ops;
 use std::process;

crossbeam-channel/src/flavors/array.rs

@@ -8,6 +8,7 @@
 //!   - <http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue>
 //!   - <https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub>
 
+use std::boxed::Box;
 use std::cell::UnsafeCell;
 use std::mem::{self, MaybeUninit};
 use std::ptr;

crossbeam-channel/src/flavors/list.rs

@@ -1,5 +1,6 @@
 //! Unbounded channel implemented as a linked list.
 
+use std::boxed::Box;
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
 use std::mem::MaybeUninit;
@@ -582,7 +583,7 @@ impl<T> Channel<T> {
         }
 
         let mut head = self.head.index.load(Ordering::Acquire);
-        let mut block = self.head.block.load(Ordering::Acquire);
+        let mut block = self.head.block.swap(ptr::null_mut(), Ordering::AcqRel);
 
         // If we're going to be dropping messages we need to synchronize with initialization
         if head >> SHIFT != tail >> SHIFT {
@@ -595,6 +596,7 @@ impl<T> Channel<T> {
                 block = self.head.block.load(Ordering::Acquire);
             }
         }
+
         unsafe {
             // Drop all messages between head and tail and deallocate the heap-allocated blocks.
             while head >> SHIFT != tail >> SHIFT {
@@ -622,7 +624,6 @@ impl<T> Channel<T> {
             }
         }
         head &= !MARK_BIT;
-        self.head.block.store(ptr::null_mut(), Ordering::Release);
         self.head.index.store(head, Ordering::Release);
     }
 

crossbeam-channel/src/flavors/zero.rs

@@ -2,6 +2,7 @@
 //!
 //! This kind of channel is also known as *rendezvous* channel.
 
+use std::boxed::Box;
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, Ordering};

crossbeam-channel/src/lib.rs

@@ -321,6 +321,7 @@
 //! [`iter`]: Receiver::iter
 //! [`try_iter`]: Receiver::try_iter
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -334,7 +335,9 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(feature = "std")]
 mod channel;

crossbeam-channel/src/select.rs

@@ -4,6 +4,7 @@ use std::fmt;
 use std::marker::PhantomData;
 use std::mem;
 use std::time::{Duration, Instant};
+use std::vec::Vec;
 
 use crossbeam_utils::Backoff;
 

crossbeam-channel/src/utils.rs

@@ -12,7 +12,7 @@ pub(crate) fn shuffle<T>(v: &mut [T]) {
         return;
     }
 
-    thread_local! {
+    std::thread_local! {
         static RNG: Cell<Wrapping<u32>> = const { Cell::new(Wrapping(1_406_868_647)) };
     }
 

crossbeam-channel/src/waker.rs

@@ -4,6 +4,7 @@ use std::ptr;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
 use std::thread::{self, ThreadId};
+use std::vec::Vec;
 
 use crate::context::Context;
 use crate::select::{Operation, Selected};
@@ -275,7 +276,7 @@ impl Drop for SyncWaker {
 /// Returns the id of the current thread.
 #[inline]
 fn current_thread_id() -> ThreadId {
-    thread_local! {
+    std::thread_local! {
         /// Cached thread-local id.
         static THREAD_ID: ThreadId = thread::current().id();
     }

crossbeam-channel/tests/mpsc.rs

@@ -193,7 +193,7 @@ mod channel_tests {
 
     use std::env;
     use std::thread;
-    use std::time::{Duration, Instant};
+    use std::time::Instant;
 
     pub fn stress_factor() -> usize {
         match env::var("RUST_TEST_STRESS") {
@@ -969,7 +969,6 @@ mod sync_channel_tests {
 
     use std::env;
     use std::thread;
-    use std::time::Duration;
 
     pub fn stress_factor() -> usize {
         match env::var("RUST_TEST_STRESS") {

crossbeam-deque/Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam-deque"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-deque-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-deque <version>'
 version = "0.8.5"
 edition = "2021"
 rust-version = "1.61"

crossbeam-deque/src/deque.rs

@@ -1,3 +1,4 @@
+use std::boxed::Box;
 use std::cell::{Cell, UnsafeCell};
 use std::cmp;
 use std::fmt;

crossbeam-deque/src/lib.rs

@@ -82,6 +82,7 @@
 //! [`steal_batch()`]: Stealer::steal_batch
 //! [`steal_batch_and_pop()`]: Stealer::steal_batch_and_pop
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -95,7 +96,9 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(feature = "std")]
 mod deque;

crossbeam-epoch/Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam-epoch"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-epoch-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-epoch <version>'
 version = "0.9.18"
 edition = "2021"
 rust-version = "1.61"

crossbeam-epoch/src/collector.rs

@@ -113,6 +113,7 @@ impl fmt::Debug for LocalHandle {
 mod tests {
     use std::mem::ManuallyDrop;
     use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::vec::Vec;
 
     use crossbeam_utils::thread;
 

crossbeam-epoch/src/default.rs

@@ -76,7 +76,7 @@ mod tests {
             }
         }
 
-        thread_local! {
+        std::thread_local! {
             static FOO: Foo = const { Foo };
         }
 

crossbeam-epoch/src/deferred.rs

@@ -90,8 +90,11 @@ impl Deferred {
 #[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use super::Deferred;
+    use std::boxed::Box;
     use std::cell::Cell;
     use std::convert::identity;
+    use std::string::ToString;
+    use std::vec;
 
     #[test]
     fn on_stack() {

crossbeam-epoch/src/internal.rs

@@ -556,7 +556,7 @@ impl IsElement<Self> for Local {
 
 #[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
-    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::atomic::AtomicUsize;
 
     use super::*;
 

crossbeam-epoch/src/lib.rs

@@ -48,6 +48,7 @@
 //! For majority of use cases, just use the default garbage collector by invoking [`pin`]. If you
 //! want to create your own garbage collector, use the [`Collector`] API.
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -61,10 +62,11 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(crossbeam_loom)]
 extern crate loom_crate as loom;
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(crossbeam_loom)]
 #[allow(unused_imports, dead_code)]

crossbeam-epoch/src/sync/list.rs

@@ -301,6 +301,7 @@ mod tests {
     use crate::{Collector, Owned};
     use crossbeam_utils::thread;
     use std::sync::Barrier;
+    use std::vec::Vec;
 
     impl IsElement<Entry> for Entry {
         fn entry_of(entry: &Entry) -> &Entry {

crossbeam-epoch/src/sync/queue.rs

@@ -219,6 +219,7 @@ mod test {
     use super::*;
     use crate::pin;
     use crossbeam_utils::thread;
+    use std::vec;
 
     struct Queue<T> {
         queue: super::Queue<T>,

crossbeam-queue/Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam-queue"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-queue-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-queue <version>'
 version = "0.3.11"
 edition = "2021"
 rust-version = "1.60"

crossbeam-queue/src/lib.rs

@@ -5,6 +5,7 @@
 //! * [`ArrayQueue`], a bounded MPMC queue that allocates a fixed-capacity buffer on construction.
 //! * [`SegQueue`], an unbounded MPMC queue that allocates small buffers, segments, on demand.
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -18,10 +19,11 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(all(feature = "alloc", target_has_atomic = "ptr"))]
 extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(all(feature = "alloc", target_has_atomic = "ptr"))]
 mod array_queue;

crossbeam-skiplist/Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam-skiplist"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-skiplist-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-skiplist <version>'
 version = "0.0.0"
 edition = "2021"
 rust-version = "1.61"

crossbeam-skiplist/src/lib.rs

@@ -228,6 +228,7 @@
 //! }
 //! ```
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -241,10 +242,11 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(all(feature = "alloc", target_has_atomic = "ptr"))]
 extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(all(feature = "alloc", target_has_atomic = "ptr"))]
 pub mod base;

crossbeam-utils/Cargo.toml

@@ -2,8 +2,8 @@
 name = "crossbeam-utils"
 # When publishing a new version:
 # - Update CHANGELOG.md
-# - Update README.md
-# - Create "crossbeam-utils-X.Y.Z" git tag
+# - Update README.md (when increasing major or minor version)
+# - Run './tools/publish.sh crossbeam-utils <version>'
 version = "0.8.19"
 edition = "2021"
 rust-version = "1.60"

crossbeam-utils/src/lib.rs

@@ -24,6 +24,7 @@
 //! [`WaitGroup`]: sync::WaitGroup
 //! [`scope`]: thread::scope
 
+#![no_std]
 #![doc(test(
     no_crate_inject,
     attr(
@@ -37,7 +38,9 @@
     rust_2018_idioms,
     unreachable_pub
 )]
-#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(feature = "std")]
+extern crate std;
 
 #[cfg(crossbeam_loom)]
 #[allow(unused_imports)]