Skip to content

Commit 6976e6d

Browse files
authored
Update portable-atomic (#3171)
* Update `portable-atomic` dependency * Remove `portable-atomic` hacks
1 parent fd2bdef commit 6976e6d

File tree

8 files changed

+9
-21
lines changed

8 files changed

+9
-21
lines changed

.github/workflows/ci.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@ jobs:
7373
with:
7474
ldproxy: false
7575
version: 1.85.0.0
76-
# TODO: Remove once https://github.com/taiki-e/portable-atomic/issues/208 is resolved
77-
- uses: dtolnay/rust-toolchain@v1
78-
with:
79-
target: riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf
80-
toolchain: nightly-2025-02-21
81-
components: clippy,rust-src
76+
8277
# Install the Rust stable toolchain for RISC-V devices:
8378
- uses: dtolnay/rust-toolchain@v1
8479
with:

esp-hal-embassy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ esp-config = { version = "0.3.0", path = "../esp-config" }
2626
esp-hal = { version = "1.0.0-beta.0", path = "../esp-hal" }
2727
log = { version = "0.4.26", optional = true }
2828
macros = { version = "0.17.0", features = ["embassy"], package = "esp-hal-procmacros", path = "../esp-hal-procmacros" }
29-
portable-atomic = "1.10.0"
29+
portable-atomic = "1.11.0"
3030
static_cell = "2.1.0"
3131

3232
[build-dependencies]

esp-hal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ instability = "0.3.7"
4646
log = { version = "0.4.26", optional = true }
4747
nb = "1.1.0"
4848
paste = "1.0.15"
49-
portable-atomic = { version = "1.10.0", default-features = false }
49+
portable-atomic = { version = "1.11.0", default-features = false }
5050
procmacros = { version = "0.17.0", package = "esp-hal-procmacros", path = "../esp-hal-procmacros" }
5151
strum = { version = "0.27.1", default-features = false, features = ["derive"] }
5252
void = { version = "1.0.2", default-features = false }

esp-println/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ features = ["esp32c3"]
1919
critical-section = { version = "1.2.0", optional = true }
2020
defmt = { version = "0.3.10", optional = true }
2121
log = { version = "0.4.26", optional = true }
22-
portable-atomic = { version = "1.10.0", optional = true, default-features = false }
22+
portable-atomic = { version = "1.11.0", optional = true, default-features = false }
2323

2424
[build-dependencies]
2525
esp-build = { version = "0.2.0", path = "../esp-build" }

esp-wifi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ embassy-sync = { version = "0.6.2", optional = true }
3434
embassy-net-driver = { version = "0.2.0", optional = true }
3535
libm = "0.2.11"
3636
cfg-if = "1.0.0"
37-
portable-atomic = { version = "1.10.0", default-features = false }
37+
portable-atomic = { version = "1.11.0", default-features = false }
3838
portable_atomic_enum = { version = "0.3.1", features = ["portable-atomic"] }
3939
rand_core = "0.6.4"
4040

hil-test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ esp-backtrace = { path = "../esp-backtrace", default-features = false, feat
224224
esp-hal = { path = "../esp-hal", default-features = false, features = ["digest"], optional = true } # TODO: default-features = false should be removed for 1.0.0-beta0
225225
esp-hal-embassy = { path = "../esp-hal-embassy", optional = true }
226226
esp-wifi = { path = "../esp-wifi", optional = true }
227-
portable-atomic = "1.9.0"
227+
portable-atomic = "1.11.0"
228228
static_cell = { version = "2.1.0", features = ["nightly"] }
229229
semihosting = { version = "0.1", features= ["stdio", "panic-handler"] }
230230
xtensa-lx-rt = { path = "../xtensa-lx-rt", optional = true }

xtask/src/documentation.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ fn cargo_doc(workspace: &Path, package: Package, chip: Option<Chip>) -> Result<P
156156
let toolchain = if chip.is_some_and(|chip| chip.is_xtensa()) {
157157
"esp"
158158
} else {
159-
// TODO: Remove date once https://github.com/taiki-e/portable-atomic/issues/208 is resolved
160-
"nightly-2025-02-21"
159+
"nightly"
161160
};
162161

163162
// Determine the appropriate build target for the given package and chip,

xtask/src/main.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,7 @@ fn lint_package(
824824
// are not overwritten.
825825
builder.toolchain("esp")
826826
} else {
827-
// TODO: Remove toolchain once https://github.com/taiki-e/portable-atomic/issues/208 is resolved
828-
builder.toolchain("nightly-2025-02-21")
827+
builder
829828
};
830829

831830
for arg in args {
@@ -934,12 +933,7 @@ fn run_doc_tests(workspace: &Path, args: ExampleArgs) -> Result<()> {
934933
let features = vec![chip.to_string(), "unstable".to_string()];
935934

936935
// We need `nightly` for building the doc tests, unfortunately:
937-
let toolchain = if chip.is_xtensa() {
938-
"esp"
939-
} else {
940-
// TODO: Remove date once https://github.com/taiki-e/portable-atomic/issues/208 is resolved
941-
"nightly-2025-02-21"
942-
};
936+
let toolchain = if chip.is_xtensa() { "esp" } else { "nightly" };
943937

944938
// Build up an array of command-line arguments to pass to `cargo`:
945939
let builder = CargoArgsBuilder::default()

0 commit comments

Comments
 (0)