Merge pull request #260 from brodycj/propagate-critical-section-to-po…

…rtable-atomic

propagate critical-section feature selection into portable-atomic; other minor updates for v1.20.0

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - 
 
+## 1.20.0
+
+- propagate `critical-section` feature selection into `portable-atomic`; other minor updates [#260](https://github.com/matklad/once_cell/pull/260)
+
 ## 1.19.0
 
 - Use `portable-atomic` instead of `atomic-polyfill`, [#251](https://github.com/matklad/once_cell/pull/251).

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.0"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -20,13 +20,13 @@ exclude = ["*.png", "*.svg", "/Cargo.lock.msrv", "rustfmt.toml"]
 members = ["xtask"]
 
 [dependencies]
-parking_lot_core = { version = "0.9.3", optional = true, default_features = false }
-portable-atomic = { version = "1", optional = true }
-critical-section = { version = "1", optional = true }
+parking_lot_core = { version = "0.9.10", optional = true, default-features = false }
+portable-atomic = { version = "1.7", optional = true }
+critical-section = { version = "1.1.3", optional = true }
 
 [dev-dependencies]
-regex = "1.2.0"
-critical-section = { version = "1.1.1", features = ["std"] }
+regex = "1.10.6"
+critical-section = { version = "1.1.3", features = ["std"] }
 
 [features]
 default = ["std"]
@@ -48,7 +48,7 @@ parking_lot = ["dep:parking_lot_core"]
 # Uses `critical-section` to implement `sync` and `race` modules. in
 # `#![no_std]` mode. Please read `critical-section` docs carefully
 # before enabling this feature.
-critical-section = ["dep:critical-section", "portable-atomic" ]
+critical-section = ["dep:critical-section", "portable-atomic/critical-section"]
 
 # Enables semver-exempt APIs of this crate.
 # At the moment, this feature is unused.

src/imp_cs.rs

@@ -1,7 +1,7 @@
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use portable_atomic::{AtomicBool, Ordering};
 use critical_section::{CriticalSection, Mutex};
+use portable_atomic::{AtomicBool, Ordering};
 
 use crate::unsync;
 

src/race.rs

@@ -19,10 +19,10 @@
 //! `Acquire` and `Release` have very little performance overhead on most
 //! architectures versus `Relaxed`.
 
-#[cfg(feature = "critical-section")]
-use portable_atomic as atomic;
 #[cfg(not(feature = "critical-section"))]
 use core::sync::atomic;
+#[cfg(feature = "critical-section")]
+use portable_atomic as atomic;
 
 use atomic::{AtomicPtr, AtomicUsize, Ordering};
 use core::cell::UnsafeCell;

xtask/src/main.rs

@@ -21,6 +21,8 @@ fn main() -> xshell::Result<()> {
  {
  let _s = section("TEST");
 
+ cmd!(sh, "cargo test --workspace").run()?;
+
  for &release in &[None, Some("--release")] {
  cmd!(sh, "cargo test --features unstable {release...}").run()?;
  cmd!(
@@ -41,6 +43,11 @@ fn main() -> xshell::Result<()> {
  {
  let _s = section("TEST_BETA");
  let _e = push_toolchain(&sh, "beta")?;
+ // TEMPORARY WORKAROUND for Rust compiler issue ref:
+ // - https://github.com/rust-lang/rust/issues/129352
+ // - https://github.com/matklad/once_cell/issues/261
+ let _e = sh.push_env("RUSTFLAGS", "-A unreachable_patterns");
+
  cmd!(sh, "cargo test --features unstable").run()?;
  }