Fix rebase fail

esp-rs · Nov 5, 2024 · 108f38a · 108f38a
1 parent 7b1d5fd
commit 108f38a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/esp-hal/src/i2s_parallel.rs b/esp-hal/src/i2s_parallel.rs
@@ -61,7 +61,7 @@ use crate::{
     },
     peripheral::{Peripheral, PeripheralRef},
     peripherals::{i2s0::RegisterBlock, I2S0, I2S1},
-    private,
+    private::Internal,
     system::PeripheralClockControl,
     Async,
     Mode,
@@ -228,7 +228,7 @@ where
         // configure the I2S peripheral for parallel mode
         i2s.setup(frequency, pins.bus_width());
         // setup the clock pin
-        clock_pin.set_to_push_pull_output(crate::private::Internal);
+        clock_pin.set_to_push_pull_output(Internal);
         i2s.ws_signal().connect_to(clock_pin);
 
         pins.configure(i2s.reborrow());

diff --git a/esp-hal/src/spi/master.rs b/esp-hal/src/spi/master.rs
@@ -85,12 +85,7 @@ use crate::{
         Rx,
         Tx,
     },
-    gpio::{
-        interconnect::{OutputConnection, PeripheralOutput},
-        InputSignal,
-        NoPin,
-        OutputSignal,
-    },
+    gpio::{interconnect::PeripheralOutput, InputSignal, NoPin, OutputSignal},
     interrupt::InterruptHandler,
     peripheral::{Peripheral, PeripheralRef},
     peripherals::spi2::RegisterBlock,