Merge #964

964: v0.8: Prepare for the next release r=taiki-e a=taiki-e

Changes:
- crossbeam-channel 0.5.6 -> 0.5.7
  - Improve handling of very large timeout. (#953)
- crossbeam-deque 0.8.2 -> 0.8.3
  - Add `Stealer::{steal_batch_with_limit, steal_batch_with_limit_and_pop}` methods. (#903)
  - Add `Injector::{steal_batch_with_limit, steal_batch_with_limit_and_pop}` methods. (#903)
- crossbeam-epoch 0.9.13 -> 0.9.14
  - Update `memoffset` to 0.8. (#955)
- crossbeam-utils 0.8.14 -> 0.8.15
  - Add `#[clippy::has_significant_drop]` to `ShardedLock{Read,Write}Guard`. (#958)
  - Improve handling of very large timeout. (#953)
  - Soft-deprecate `thread::scope()` in favor of the more efficient `std::thread::scope` that stabilized on Rust 1.63. (#954)

Backports:
- #903
- #936
- #953
- #954
- #955
- #958

Co-authored-by: glorv <[email protected]>
Co-authored-by: Taiki Endo <[email protected]>
Co-authored-by: Alexis (Poliorcetics) Bourget <[email protected]>
Co-authored-by: Caio <[email protected]>

.github/workflows/ci.yml

@@ -85,6 +85,8 @@ jobs:
           toolchain: ${{ matrix.rust }}
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
+      - name: Install cargo-no-dev-deps
+        uses: taiki-e/install-action@cargo-no-dev-deps
       - name: Check features
         run: ./ci/check-features.sh
 

ci/check-features.sh

@@ -6,13 +6,13 @@ cd "$(dirname "$0")"/..
 if [[ "$RUST_VERSION" != "nightly"* ]]; then
     # On MSRV, features other than nightly should work.
     # * `--feature-powerset` - run for the feature powerset which includes --no-default-features and default features of package
-    # * `--no-dev-deps` - build without dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
-    # * `--exclude benchmarks` - benchmarks doesn't published.
+    # * `no-dev-deps` - build without dev-dependencies to avoid https://github.com/rust-lang/cargo/issues/4866
+    # * `--no-private` - exclude private crate such as benchmarks.
     # * `--skip nightly` - skip `nightly` feature as requires nightly compilers.
-    cargo hack build --all --feature-powerset --no-dev-deps --exclude benchmarks --skip nightly
+    cargo no-dev-deps hack build --all --feature-powerset --no-private --skip nightly
 else
     # On nightly, all feature　combinations should work.
-    cargo hack build --all --feature-powerset --no-dev-deps --exclude benchmarks
+    cargo no-dev-deps hack build --all --feature-powerset --no-private
 
     # Build for no_std environment.
     # thumbv7m-none-eabi supports atomic CAS.
@@ -21,7 +21,7 @@ else
     rustup target add thumbv7m-none-eabi
     rustup target add thumbv6m-none-eabi
     rustup target add riscv32i-unknown-none-elf
-    cargo hack build --all --feature-powerset --no-dev-deps --exclude benchmarks --target thumbv7m-none-eabi --skip std,default
-    cargo hack build --all --feature-powerset --no-dev-deps --exclude benchmarks --target thumbv6m-none-eabi --skip std,default
-    cargo hack build --all --feature-powerset --no-dev-deps --exclude benchmarks --target riscv32i-unknown-none-elf --skip std,default
+    cargo no-dev-deps hack build --all --feature-powerset --no-private --target thumbv7m-none-eabi --skip std,default
+    cargo no-dev-deps hack build --all --feature-powerset --no-private --target thumbv6m-none-eabi --skip std,default
+    cargo no-dev-deps hack build --all --feature-powerset --no-private --target riscv32i-unknown-none-elf --skip std,default
 fi

ci/no_atomic.sh

@@ -18,6 +18,7 @@ for target in $(rustc --print target-list); do
     res=$(jq <<<"${target_spec}" -r 'select(."atomic-cas" == false)')
     [[ -z "${res}" ]] || no_atomic_cas+=("${target}")
     max_atomic_width=$(jq <<<"${target_spec}" -r '."max-atomic-width"')
+    min_atomic_width=$(jq <<<"${target_spec}" -r '."min-atomic-width"')
     case "${max_atomic_width}" in
         # It is not clear exactly what `"max-atomic-width" == null` means, but they
         # actually seem to have the same max-atomic-width as the target-pointer-width.
@@ -35,6 +36,10 @@ for target in $(rustc --print target-list); do
         # There is no `"max-atomic-width" == 16` or `"max-atomic-width" == 8` targets.
         *) exit 1 ;;
     esac
+    case "${min_atomic_width}" in
+        8 | null)  ;;
+        *) no_atomic+=("${target}") ;;
+    esac
 done
 
 cat >"${file}" <<EOF

crossbeam-channel/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.5.7
+
+- Improve handling of very large timeout. (#953)
+
 # Version 0.5.6
 
 - Bump the minimum supported Rust version to 1.38. (#877)

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.6"
+version = "0.5.7"
 edition = "2018"
 rust-version = "1.38"
 license = "MIT OR Apache-2.0"

crossbeam-channel/src/channel.rs

@@ -14,7 +14,6 @@ use crate::err::{
 };
 use crate::flavors;
 use crate::select::{Operation, SelectHandle, Token};
-use crate::utils;
 
 /// Creates a channel of unbounded capacity.
 ///
@@ -172,8 +171,11 @@ pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
 /// assert!(eq(Instant::now(), start + ms(500)));
 /// ```
 pub fn after(duration: Duration) -> Receiver<Instant> {
-    Receiver {
-        flavor: ReceiverFlavor::At(Arc::new(flavors::at::Channel::new_timeout(duration))),
+    match Instant::now().checked_add(duration) {
+        Some(deadline) => Receiver {
+            flavor: ReceiverFlavor::At(Arc::new(flavors::at::Channel::new_deadline(deadline))),
+        },
+        None => never(),
     }
 }
 
@@ -320,8 +322,14 @@ pub fn never<T>() -> Receiver<T> {
 /// assert!(eq(Instant::now(), start + ms(700)));
 /// ```
 pub fn tick(duration: Duration) -> Receiver<Instant> {
-    Receiver {
-        flavor: ReceiverFlavor::Tick(Arc::new(flavors::tick::Channel::new(duration))),
+    match Instant::now().checked_add(duration) {
+        Some(delivery_time) => Receiver {
+            flavor: ReceiverFlavor::Tick(Arc::new(flavors::tick::Channel::new(
+                delivery_time,
+                duration,
+            ))),
+        },
+        None => never(),
     }
 }
 
@@ -474,7 +482,10 @@ impl<T> Sender<T> {
     /// );
     /// ```
     pub fn send_timeout(&self, msg: T, timeout: Duration) -> Result<(), SendTimeoutError<T>> {
-        self.send_deadline(msg, utils::convert_timeout_to_deadline(timeout))
+        match Instant::now().checked_add(timeout) {
+            Some(deadline) => self.send_deadline(msg, deadline),
+            None => self.send(msg).map_err(SendTimeoutError::from),
+        }
     }
 
     /// Waits for a message to be sent into the channel, but only until a given deadline.
@@ -864,7 +875,10 @@ impl<T> Receiver<T> {
     /// );
     /// ```
     pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
-        self.recv_deadline(utils::convert_timeout_to_deadline(timeout))
+        match Instant::now().checked_add(timeout) {
+            Some(deadline) => self.recv_deadline(deadline),
+            None => self.recv().map_err(RecvTimeoutError::from),
+        }
     }
 
     /// Waits for a message to be received from the channel, but only before a given deadline.

crossbeam-channel/src/flavors/at.rs

@@ -4,7 +4,7 @@
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread;
-use std::time::{Duration, Instant};
+use std::time::Instant;
 
 use crate::context::Context;
 use crate::err::{RecvTimeoutError, TryRecvError};
@@ -32,11 +32,6 @@ impl Channel {
             received: AtomicBool::new(false),
         }
     }
-    /// Creates a channel that delivers a message after a certain duration of time.
-    #[inline]
-    pub(crate) fn new_timeout(dur: Duration) -> Self {
-        Self::new_deadline(utils::convert_timeout_to_deadline(dur))
-    }
 
     /// Attempts to receive a message without blocking.
     #[inline]

crossbeam-channel/src/flavors/tick.rs

@@ -10,7 +10,6 @@ use crossbeam_utils::atomic::AtomicCell;
 use crate::context::Context;
 use crate::err::{RecvTimeoutError, TryRecvError};
 use crate::select::{Operation, SelectHandle, Token};
-use crate::utils;
 
 /// Result of a receive operation.
 pub(crate) type TickToken = Option<Instant>;
@@ -27,9 +26,9 @@ pub(crate) struct Channel {
 impl Channel {
     /// Creates a channel that delivers messages periodically.
     #[inline]
-    pub(crate) fn new(dur: Duration) -> Self {
+    pub(crate) fn new(delivery_time: Instant, dur: Duration) -> Self {
         Channel {
-            delivery_time: AtomicCell::new(utils::convert_timeout_to_deadline(dur)),
+            delivery_time: AtomicCell::new(delivery_time),
             duration: dur,
         }
     }

crossbeam-channel/src/select.rs

@@ -487,7 +487,10 @@ pub fn select_timeout<'a>(
     handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
     timeout: Duration,
 ) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
-    select_deadline(handles, utils::convert_timeout_to_deadline(timeout))
+    match Instant::now().checked_add(timeout) {
+        Some(deadline) => select_deadline(handles, deadline),
+        None => Ok(select(handles)),
+    }
 }
 
 /// Blocks until a given deadline, or until one of the operations becomes ready and selects it.
@@ -1045,7 +1048,10 @@ impl<'a> Select<'a> {
     /// }
     /// ```
     pub fn ready_timeout(&mut self, timeout: Duration) -> Result<usize, ReadyTimeoutError> {
-        self.ready_deadline(utils::convert_timeout_to_deadline(timeout))
+        match Instant::now().checked_add(timeout) {
+            Some(deadline) => self.ready_deadline(deadline),
+            None => Ok(self.ready()),
+        }
     }
 
     /// Blocks until a given deadline, or until one of the operations becomes ready.

crossbeam-channel/src/utils.rs

@@ -56,11 +56,3 @@ pub(crate) fn sleep_until(deadline: Option<Instant>) {
         }
     }
 }
-
-// https://github.com/crossbeam-rs/crossbeam/issues/795
-pub(crate) fn convert_timeout_to_deadline(timeout: Duration) -> Instant {
-    match Instant::now().checked_add(timeout) {
-        Some(deadline) => deadline,
-        None => Instant::now() + Duration::from_secs(86400 * 365 * 30),
-    }
-}

crossbeam-deque/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.8.3
+
+- Add `Stealer::{steal_batch_with_limit, steal_batch_with_limit_and_pop}` methods. (#903)
+- Add `Injector::{steal_batch_with_limit, steal_batch_with_limit_and_pop}` methods. (#903)
+
 # Version 0.8.2
 
 - Bump the minimum supported Rust version to 1.38. (#877)

crossbeam-deque/Cargo.toml

@@ -4,7 +4,7 @@ name = "crossbeam-deque"
 # - Update CHANGELOG.md
 # - Update README.md
 # - Create "crossbeam-deque-X.Y.Z" git tag
-version = "0.8.2"
+version = "0.8.3"
 edition = "2018"
 rust-version = "1.38"
 license = "MIT OR Apache-2.0"