From 468ffc50b740b540c5a840979b943d964ccdc7c7 Mon Sep 17 00:00:00 2001
From: Stephane Raux <94983192+stefunctional@users.noreply.github.com>
Date: Wed, 17 Jan 2024 05:23:05 -0600
Subject: [PATCH] Depend on portable-atomic-* only if the target has no OS
 (#65)

---
 mls-rs/Cargo.toml                                        | 9 ++++++---
 .../storage_provider/in_memory/group_state_storage.rs    | 4 ++--
 .../storage_provider/in_memory/key_package_storage.rs    | 4 ++--
 mls-rs/src/storage_provider/in_memory/psk_storage.rs     | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mls-rs/Cargo.toml b/mls-rs/Cargo.toml
index 4eb1148c..aa75def1 100644
--- a/mls-rs/Cargo.toml
+++ b/mls-rs/Cargo.toml
@@ -57,9 +57,7 @@ thiserror = { version = "1.0.40", optional = true }
 itertools = { version = "0.12.0", default-features = false, features = ["use_alloc"]}
 cfg-if = "1"
 debug_tree = { version = "0.4.0", optional = true }
-spin = { version = "0.9.8", default-features = false, features = ["mutex", "spin_mutex", "portable_atomic"] }
-portable-atomic = { version = "1.5.1", default-features = false, features = ["critical-section"] }
-portable-atomic-util = { version = "0.1.2", default-features = false, features = ["alloc"] }
+spin = { version = "0.9.8", default-features = false, features = ["mutex", "spin_mutex"] }
 maybe-async = { version = "0.2.7" }
 
 # Optional dependencies
@@ -77,6 +75,11 @@ once_cell = { version = "1.18", optional = true }
 futures = { version = "0.3.25", default-features = false, features = ["alloc"]}
 async-trait = "0.1.74"
 
+[target.'cfg(target_os = "none")'.dependencies]
+portable-atomic = { version = "1.5.1", default-features = false, features = ["critical-section"] }
+portable-atomic-util = { version = "0.1.2", default-features = false, features = ["alloc"] }
+spin = { version = "0.9.8", default-features = false, features = ["portable_atomic"] }
+
 [target.'cfg(mls_build_async)'.dev-dependencies]
 futures-test = "0.3.25"
 
diff --git a/mls-rs/src/storage_provider/in_memory/group_state_storage.rs b/mls-rs/src/storage_provider/in_memory/group_state_storage.rs
index 672e0314..87a797c1 100644
--- a/mls-rs/src/storage_provider/in_memory/group_state_storage.rs
+++ b/mls-rs/src/storage_provider/in_memory/group_state_storage.rs
@@ -4,7 +4,7 @@
 
 use alloc::collections::VecDeque;
 
-#[cfg(feature = "std")]
+#[cfg(not(target_os = "none"))]
 use alloc::sync::Arc;
 
 #[cfg(mls_build_async)]
@@ -12,7 +12,7 @@ use alloc::boxed::Box;
 use alloc::vec::Vec;
 use mls_rs_codec::{MlsDecode, MlsEncode};
 use mls_rs_core::group::{EpochRecord, GroupState, GroupStateStorage};
-#[cfg(not(feature = "std"))]
+#[cfg(target_os = "none")]
 use portable_atomic_util::Arc;
 
 use crate::{client::MlsError, storage_provider::group_state::EpochData};
diff --git a/mls-rs/src/storage_provider/in_memory/key_package_storage.rs b/mls-rs/src/storage_provider/in_memory/key_package_storage.rs
index 182275e8..de2de555 100644
--- a/mls-rs/src/storage_provider/in_memory/key_package_storage.rs
+++ b/mls-rs/src/storage_provider/in_memory/key_package_storage.rs
@@ -2,10 +2,10 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-#[cfg(feature = "std")]
+#[cfg(not(target_os = "none"))]
 use alloc::sync::Arc;
 
-#[cfg(not(feature = "std"))]
+#[cfg(target_os = "none")]
 use portable_atomic_util::Arc;
 
 use core::convert::Infallible;
diff --git a/mls-rs/src/storage_provider/in_memory/psk_storage.rs b/mls-rs/src/storage_provider/in_memory/psk_storage.rs
index 2d28b1ce..ea67e2ad 100644
--- a/mls-rs/src/storage_provider/in_memory/psk_storage.rs
+++ b/mls-rs/src/storage_provider/in_memory/psk_storage.rs
@@ -2,10 +2,10 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-#[cfg(feature = "std")]
+#[cfg(not(target_os = "none"))]
 use alloc::sync::Arc;
 
-#[cfg(not(feature = "std"))]
+#[cfg(target_os = "none")]
 use portable_atomic_util::Arc;
 
 use core::convert::Infallible;