From 01bff1b037daef445843a41245a89f19ca31fd6f Mon Sep 17 00:00:00 2001
From: Ivan Markov <ivan.markov@gmail.com>
Date: Sun, 19 Jun 2022 11:49:25 +0300
Subject: [PATCH] Unalloc (#90)

* unalloc

* unalloc

* unalloc

* unalloc
---
 Cargo.toml       | 10 +++++-----
 src/interrupt.rs | 12 ++++++------
 src/mutex.rs     | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c719d4fbf..7a92a7450 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "esp-idf-hal"
-version = "0.37.4"
+version = "0.38.0"
 authors = ["sapir <yasapir@gmail.com>", "Ivan Markov <ivan.markov@gmail.com>"]
 edition = "2018"
 resolver = "2"
@@ -15,20 +15,20 @@ documentation = "https://esp-rs.github.io/esp-idf-hal/"
 [features]
 default = ["std", "alloc", "esp-idf-sys", "embedded-svc"]
 
-std = ["alloc", "esp-idf-sys/std"]
+std = ["alloc", "esp-idf-sys/std", "embedded-svc?/std"]
 
-alloc = []
+alloc = ["embedded-svc?/alloc"]
 
 riscv-ulp-hal = []
 
-experimental = []
+experimental = ["embedded-svc?/experimental"]
 
 [dependencies]
 nb = "0.1.2"
 mutex-trait = { version = "0.2", optional = true, default-features = false }
 embedded-hal = "=1.0.0-alpha.8"
 embedded-hal-0-2 = { package = "embedded-hal", version = "0.2.7", features = ["unproven"] }
-embedded-svc = { version = "0.21.2", optional = true, default-features = false }
+embedded-svc = { version = "0.22.0", optional = true, default-features = false }
 esp-idf-sys = { version = "0.31.4", optional = true, default-features = false, features = ["native"] }
 critical-section = { version = "0.2.5", optional = true, features = ["custom-impl"] }
 embassy = { version = "0", optional = true }
diff --git a/src/interrupt.rs b/src/interrupt.rs
index 69f70f76c..ab693e020 100644
--- a/src/interrupt.rs
+++ b/src/interrupt.rs
@@ -462,20 +462,20 @@ impl embedded_svc::mutex::MutexFamily for MutexFamily {
 }
 
 #[cfg(all(feature = "experimental", feature = "embedded-svc"))]
-impl embedded_svc::signal::asyncs::SignalFamily for MutexFamily {
-    type Signal<T> = embedded_svc::utils::asyncs::signal::MutexSignal<
-        Mutex<embedded_svc::utils::asyncs::signal::State<T>>,
+impl embedded_svc::signal::asynch::SignalFamily for MutexFamily {
+    type Signal<T> = embedded_svc::utils::asynch::signal::MutexSignal<
+        Mutex<embedded_svc::utils::asynch::signal::State<T>>,
         T,
     >;
 }
 
 #[cfg(all(feature = "experimental", feature = "embedded-svc"))]
-impl embedded_svc::signal::asyncs::SendSyncSignalFamily for MutexFamily {
+impl embedded_svc::signal::asynch::SendSyncSignalFamily for MutexFamily {
     type Signal<T>
     where
         T: Send,
-    = embedded_svc::utils::asyncs::signal::MutexSignal<
-        Mutex<embedded_svc::utils::asyncs::signal::State<T>>,
+    = embedded_svc::utils::asynch::signal::MutexSignal<
+        Mutex<embedded_svc::utils::asynch::signal::State<T>>,
         T,
     >;
 }
diff --git a/src/mutex.rs b/src/mutex.rs
index 66600545c..2e8b33ce4 100644
--- a/src/mutex.rs
+++ b/src/mutex.rs
@@ -174,20 +174,20 @@ impl embedded_svc::mutex::MutexFamily for Condvar {
 }
 
 #[cfg(all(feature = "experimental", feature = "embedded-svc"))]
-impl embedded_svc::signal::asyncs::SignalFamily for Condvar {
-    type Signal<T> = embedded_svc::utils::asyncs::signal::MutexSignal<
-        Mutex<embedded_svc::utils::asyncs::signal::State<T>>,
+impl embedded_svc::signal::asynch::SignalFamily for Condvar {
+    type Signal<T> = embedded_svc::utils::asynch::signal::MutexSignal<
+        Mutex<embedded_svc::utils::asynch::signal::State<T>>,
         T,
     >;
 }
 
 #[cfg(all(feature = "experimental", feature = "embedded-svc"))]
-impl embedded_svc::signal::asyncs::SendSyncSignalFamily for Condvar {
+impl embedded_svc::signal::asynch::SendSyncSignalFamily for Condvar {
     type Signal<T>
     where
         T: Send,
-    = embedded_svc::utils::asyncs::signal::MutexSignal<
-        Mutex<embedded_svc::utils::asyncs::signal::State<T>>,
+    = embedded_svc::utils::asynch::signal::MutexSignal<
+        Mutex<embedded_svc::utils::asynch::signal::State<T>>,
         T,
     >;
 }