Merge #727

bors[bot] · Dirbaio · web-flow · commit afb4f8623b9f · 2022-04-22T18:15:05.000Z
727: Switch to crates.io embedded-hal, embedded-hal-async. r=Dirbaio a=Dirbaio

This temporarily removes support for the async UART trait, since it's
not yet in embedded-hal-async.

Co-authored-by: Dario Nieuwenhuis &lt;dirbaio@dirbaio.net&gt;
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml
@@ -27,8 +27,8 @@ log = { version = "0.4.14", optional = true }
 
 embassy = { version = "0.1.0", path = "../embassy", default-features = false }
 embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 embassy-hal-common = { version = "0.1.0", path = "../embassy-hal-common", default-features = false }
 futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] }
 embedded-hal = { version = "0.2", features = ["unproven"] }
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
@@ -67,8 +67,8 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-usb = {version = "0.1.0", path = "../embassy-usb", optional=true }
 
 embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8", optional = true}
+embedded-hal-async = { version = "0.1.0-alpha.0", optional = true}
 
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
@@ -935,7 +935,7 @@ mod eh1 {
 }
 
 cfg_if::cfg_if! {
-    if #[cfg(all(feature = "unstable-traits", feature = "nightly"))] {
+    if #[cfg(all(feature = "unstable-traits", feature = "nightly", feature = "_todo_embedded_hal_serial"))] {
         use core::future::Future;
 
         impl<'d, T: Instance> embedded_hal_async::serial::Read for Uarte<'d, T> {
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
@@ -42,5 +42,5 @@ rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a
 #rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] }
 
 embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8", optional = true}
+embedded-hal-async = { version = "0.1.0-alpha.0", optional = true}
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
@@ -39,8 +39,8 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-net = { version = "0.1.0", path = "../embassy-net", optional = true }
 
 embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8", optional = true}
+embedded-hal-async = { version = "0.1.0-alpha.0", optional = true}
 
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
@@ -363,7 +363,7 @@ mod eh1 {
 }
 
 cfg_if::cfg_if! {
-    if #[cfg(all(feature = "unstable-traits", feature = "nightly"))] {
+    if #[cfg(all(feature = "unstable-traits", feature = "nightly", feature = "_todo_embedded_hal_serial"))] {
         use core::future::Future;
 
         impl<'d, T: Instance, TxDma> embedded_hal_async::serial::Write for UartTx<'d, T, TxDma>
diff --git a/embassy-traits/Cargo.toml b/embassy-traits/Cargo.toml
@@ -9,8 +9,8 @@ std = []
 
 [dependencies]
 embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2" }
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 embedded-storage = "0.3.0"
 embedded-storage-async = "0.3.0"
 nb = "1.0.0"
diff --git a/embassy-traits/src/adapter.rs b/embassy-traits/src/adapter.rs
@@ -161,6 +161,7 @@ where
     type Error = E;
 }
 
+#[cfg(feature = "_todo_embedded_hal_serial")]
 impl<T, E> embedded_hal_async::serial::Read for BlockingAsync<T>
 where
     T: serial::Read<u8, Error = E>,
@@ -185,6 +186,7 @@ where
     }
 }
 
+#[cfg(feature = "_todo_embedded_hal_serial")]
 impl<T, E> embedded_hal_async::serial::Write for BlockingAsync<T>
 where
     T: blocking::serial::Write<u8, Error = E> + serial::Read<u8, Error = E>,
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
@@ -57,8 +57,8 @@ defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
 embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" }
-embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8", optional = true}
+embedded-hal-async = { version = "0.1.0-alpha.0", optional = true}
 
 futures     = { version = "0.3.17", default-features = false, features = [ "cfg-target-has-atomic", "unstable" ] }
 pin-project = { version = "1.0.8", default-features = false }
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
@@ -20,7 +20,8 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
 display-interface-spi = "0.4.1"
 embedded-graphics = "0.7.1"
 st7789 = "0.6.1"
-
-embedded-hal = { version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2" }
 display-interface = "0.4.1"
 byte-slice-cast = { version = "1.2.0", default-features = false }
+
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs
@@ -110,9 +110,9 @@ mod shared_spi {
     use core::cell::RefCell;
     use core::fmt::Debug;
 
-    use embedded_hal::digital::blocking::OutputPin;
-    use embedded_hal::spi;
-    use embedded_hal::spi::blocking::SpiDevice;
+    use embedded_hal_1::digital::blocking::OutputPin;
+    use embedded_hal_1::spi;
+    use embedded_hal_1::spi::blocking::SpiDevice;
 
     #[derive(Copy, Clone, Eq, PartialEq, Debug)]
     pub enum SpiDeviceWithCsError<BUS, CS> {
@@ -184,7 +184,7 @@ mod shared_spi {
 
 /// Driver for the XPT2046 resistive touchscreen sensor
 mod touch {
-    use embedded_hal::spi::blocking::{SpiBus, SpiBusRead, SpiBusWrite, SpiDevice};
+    use embedded_hal_1::spi::blocking::{SpiBus, SpiBusRead, SpiBusWrite, SpiDevice};
 
     struct Calibration {
         x1: i32,
@@ -248,8 +248,8 @@ mod touch {
 
 mod my_display_interface {
     use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand};
-    use embedded_hal::digital::blocking::OutputPin;
-    use embedded_hal::spi::blocking::{SpiBusWrite, SpiDevice};
+    use embedded_hal_1::digital::blocking::OutputPin;
+    use embedded_hal_1::spi::blocking::{SpiBusWrite, SpiDevice};
 
     /// SPI display interface.
     ///
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
@@ -18,7 +18,8 @@ defmt-rtt = "0.3"
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml
@@ -18,7 +18,8 @@ defmt-rtt = "0.3"
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32l4/src/bin/usart_blocking_async.rs b/examples/stm32l4/src/bin/usart_blocking_async.rs
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml
@@ -23,7 +23,8 @@ defmt-rtt = "0.3.0"
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-embedded-hal-async = { version = "0.0.1", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2"}
+embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.8" }
+embedded-hal-async = { version = "0.1.0-alpha.0" }
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
 
 [profile.dev]

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,7 @@ mod eh1 {`
`935`	`935`	`}`
`936`	`936`
`937`	`937`	`cfg_if::cfg_if! {`
`938`		`- if #[cfg(all(feature = "unstable-traits", feature = "nightly"))] {`
	`938`	`+ if #[cfg(all(feature = "unstable-traits", feature = "nightly", feature = "_todo_embedded_hal_serial"))] {`
`939`	`939`	`use core::future::Future;`
`940`	`940`
`941`	`941`	`impl<'d, T: Instance> embedded_hal_async::serial::Read for Uarte<'d, T> {`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ mod eh1 {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`cfg_if::cfg_if! {`
`366`		`- if #[cfg(all(feature = "unstable-traits", feature = "nightly"))] {`
	`366`	`+ if #[cfg(all(feature = "unstable-traits", feature = "nightly", feature = "_todo_embedded_hal_serial"))] {`
`367`	`367`	`use core::future::Future;`
`368`	`368`
`369`	`369`	`impl<'d, T: Instance, TxDma> embedded_hal_async::serial::Write for UartTx<'d, T, TxDma>`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ where`
`161`	`161`	`type Error = E;`
`162`	`162`	`}`
`163`	`163`
	`164`	`+#[cfg(feature = "_todo_embedded_hal_serial")]`
`164`	`165`	`impl<T, E> embedded_hal_async::serial::Read for BlockingAsync<T>`
`165`	`166`	`where`
`166`	`167`	`T: serial::Read<u8, Error = E>,`
`@@ -185,6 +186,7 @@ where`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`
	`189`	`+#[cfg(feature = "_todo_embedded_hal_serial")]`
`188`	`190`	`impl<T, E> embedded_hal_async::serial::Write for BlockingAsync<T>`
`189`	`191`	`where`
`190`	`192`	`T: blocking::serial::Write<u8, Error = E> + serial::Read<u8, Error = E>,`