From 8d8d50cc7a97fa65976e9dc1a82a58de29e7eb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Buga?= <bugadani@gmail.com>
Date: Mon, 6 Nov 2023 15:21:53 +0100
Subject: [PATCH] Yeet core::sync::atomic, remove futures-util dep

---
 embassy-executor/CHANGELOG.md        | 4 ++++
 embassy-executor/Cargo.toml          | 1 -
 embassy-executor/src/arch/riscv32.rs | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/embassy-executor/CHANGELOG.md b/embassy-executor/CHANGELOG.md
index cade48f02..ad3e2e957 100644
--- a/embassy-executor/CHANGELOG.md
+++ b/embassy-executor/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.2
+
+- Use `atomic-polyfill` for `riscv32`
+
 ## 0.3.1 - 2023-11-01
 
 - Fix spurious "Found waker not created by the Embassy executor" error in recent nightlies.
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 8e36637a3..f59d0f977 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -57,7 +57,6 @@ defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 rtos-trace = { version = "0.1.2", optional = true }
 
-futures-util = { version = "0.3.17", default-features = false }
 embassy-macros = { version = "0.2.1", path = "../embassy-macros" }
 embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true}
 atomic-polyfill = "1.0.1"
diff --git a/embassy-executor/src/arch/riscv32.rs b/embassy-executor/src/arch/riscv32.rs
index 40c6877e2..e5c0ff2ec 100644
--- a/embassy-executor/src/arch/riscv32.rs
+++ b/embassy-executor/src/arch/riscv32.rs
@@ -6,8 +6,8 @@ pub use thread::*;
 #[cfg(feature = "executor-thread")]
 mod thread {
     use core::marker::PhantomData;
-    use core::sync::atomic::{AtomicBool, Ordering};
 
+    use atomic_polyfill::{AtomicBool, Ordering};
     #[cfg(feature = "nightly")]
     pub use embassy_macros::main_riscv as main;