Skip to content

Commit c1fdffc

Browse files
committed
Formatting
1 parent 5c52cc0 commit c1fdffc

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

examples/serial-hal-blocking-echo/src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ use core::fmt::Write;
77

88
#[cfg(feature = "v1")]
99
use microbit::{
10+
hal::prelude::*,
1011
hal::uart,
1112
hal::uart::{Baudrate, Parity},
12-
hal::prelude::*,
1313
};
1414

1515
#[cfg(feature = "v2")]
1616
use microbit::{
17+
hal::prelude::*,
1718
hal::uarte,
1819
hal::uarte::{Baudrate, Parity},
19-
hal::prelude::*,
2020
};
2121

2222
use cortex_m_rt::entry;
@@ -26,7 +26,6 @@ mod serial_setup;
2626
#[cfg(feature = "v2")]
2727
use serial_setup::UartePort;
2828

29-
3029
#[entry]
3130
fn main() -> ! {
3231
let board = microbit::Board::take().unwrap();

examples/serial-hal-blocking-echo/src/serial_setup.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use microbit::hal::uarte::{Uarte, UarteTx, UarteRx, Instance, Error};
2-
use embedded_hal::serial;
3-
use embedded_hal::blocking::serial as bserial;
41
use core::fmt;
2+
use embedded_hal::blocking::serial as bserial;
3+
use embedded_hal::serial;
4+
use microbit::hal::uarte::{Error, Instance, Uarte, UarteRx, UarteTx};
55

66
static mut TX_BUF: [u8; 1] = [0; 1];
77
static mut RX_BUF: [u8; 1] = [0; 1];
@@ -10,17 +10,16 @@ pub struct UartePort<T: Instance>(UarteTx<T>, UarteRx<T>);
1010

1111
impl<T: Instance> UartePort<T> {
1212
pub fn new(serial: Uarte<T>) -> UartePort<T> {
13-
let (tx, rx) = serial.split(
14-
unsafe { &mut TX_BUF },
15-
unsafe { &mut RX_BUF }
16-
).unwrap();
13+
let (tx, rx) = serial
14+
.split(unsafe { &mut TX_BUF }, unsafe { &mut RX_BUF })
15+
.unwrap();
1716
UartePort(tx, rx)
1817
}
1918
}
2019

2120
impl<T: Instance> fmt::Write for UartePort<T> {
2221
fn write_str(&mut self, s: &str) -> fmt::Result {
23-
self.0.write_str(s)
22+
self.0.write_str(s)
2423
}
2524
}
2625

@@ -42,6 +41,6 @@ impl<T: Instance> serial::Read<u8> for UartePort<T> {
4241
type Error = Error;
4342

4443
fn read(&mut self) -> nb::Result<u8, Self::Error> {
45-
self.1.read()
44+
self.1.read()
4645
}
4746
}

0 commit comments

Comments
 (0)