Skip to content

Commit c97573a

Browse files
committed
Bump portable-atomic to 0.3.16 and stop using fetch_* methods
1 parent 4b479d0 commit c97573a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ci/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ main() {
4747
echo 'derive_more = "0.99"' >> $td/Cargo.toml
4848
fi
4949
if [[ "$options" == *"--atomics"* ]]; then
50-
echo 'portable-atomic = { version = "0.3.15", default-features = false }' >> $td/Cargo.toml
50+
echo 'portable-atomic = { version = "0.3.16", default-features = false }' >> $td/Cargo.toml
5151
fi
5252
echo '[profile.dev]' >> $td/Cargo.toml
5353
echo 'incremental = false' >> $td/Cargo.toml

ci/svd2rust-regress/src/svd_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::process::{Command, Output};
88
const CRATES_ALL: &[&str] = &["critical-section = \"1.0\"", "vcell = \"0.1.2\""];
99
const CRATES_MSP430: &[&str] = &["msp430 = \"0.4.0\"", "msp430-rt = \"0.4.0\""];
1010
const CRATES_ATOMICS: &[&str] =
11-
&["portable-atomic = { version = \"0.3.15\", default-features = false }"];
11+
&["portable-atomic = { version = \"0.3.16\", default-features = false }"];
1212
const CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.7.6\"", "cortex-m-rt = \"0.6.13\""];
1313
const CRATES_RISCV: &[&str] = &["riscv = \"0.9.0\"", "riscv-rt = \"0.9.0\""];
1414
const CRATES_XTENSALX: &[&str] = &["xtensa-lx-rt = \"0.9.0\"", "xtensa-lx = \"0.6.0\""];

src/generate/generic_atomic.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ mod atomic {
1111
($U:ty, $Atomic:ty) => {
1212
impl AtomicOperations for $U {
1313
unsafe fn atomic_or(ptr: *mut Self, val: Self) {
14-
(*(ptr as *const $Atomic)).fetch_or(val, Ordering::SeqCst);
14+
(*(ptr as *const $Atomic)).or(val, Ordering::SeqCst);
1515
}
1616

1717
unsafe fn atomic_and(ptr: *mut Self, val: Self) {
18-
(*(ptr as *const $Atomic)).fetch_and(val, Ordering::SeqCst);
18+
(*(ptr as *const $Atomic)).and(val, Ordering::SeqCst);
1919
}
2020

2121
unsafe fn atomic_xor(ptr: *mut Self, val: Self) {
22-
(*(ptr as *const $Atomic)).fetch_xor(val, Ordering::SeqCst);
22+
(*(ptr as *const $Atomic)).xor(val, Ordering::SeqCst);
2323
}
2424
}
2525
};

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
//! concurrently called on different bits in the same register without data races. This flag won't
493493
//! work for RISCV chips without the atomic extension.
494494
//!
495-
//! `portable-atomic` v0.3.15 must be added to the dependencies, with default features off to
495+
//! `portable-atomic` v0.3.16 must be added to the dependencies, with default features off to
496496
//! disable the `fallback` feature.
497497
//!
498498
//! Usage examples:

0 commit comments

Comments
 (0)