From a8703b75988e1e700af701116464025679d2feb8 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sun, 12 Jun 2022 22:15:44 +0200 Subject: Run rustfmt. --- examples/rp/src/bin/blinky.rs | 4 +--- examples/rp/src/bin/button.rs | 4 +--- examples/rp/src/bin/spi.rs | 7 ++----- examples/rp/src/bin/spi_display.rs | 12 ++++-------- examples/rp/src/bin/uart.rs | 4 +--- 5 files changed, 9 insertions(+), 22 deletions(-) (limited to 'examples/rp/src/bin') diff --git a/examples/rp/src/bin/blinky.rs b/examples/rp/src/bin/blinky.rs index 6f199d07e..35612a4cf 100644 --- a/examples/rp/src/bin/blinky.rs +++ b/examples/rp/src/bin/blinky.rs @@ -7,9 +7,7 @@ use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; use embassy_rp::{gpio, Peripherals}; use gpio::{Level, Output}; - -use defmt_rtt as _; // global logger -use panic_probe as _; +use {defmt_rtt as _, panic_probe as _}; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { diff --git a/examples/rp/src/bin/button.rs b/examples/rp/src/bin/button.rs index 2418ad012..980e54ea1 100644 --- a/examples/rp/src/bin/button.rs +++ b/examples/rp/src/bin/button.rs @@ -5,9 +5,7 @@ use embassy::executor::Spawner; use embassy_rp::gpio::{Input, Level, Output, Pull}; use embassy_rp::Peripherals; - -use defmt_rtt as _; // global logger -use panic_probe as _; +use {defmt_rtt as _, panic_probe as _}; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs index b38424363..d97aa94b3 100644 --- a/examples/rp/src/bin/spi.rs +++ b/examples/rp/src/bin/spi.rs @@ -4,13 +4,10 @@ use defmt::*; use embassy::executor::Spawner; -use embassy_rp::spi; use embassy_rp::spi::Spi; -use embassy_rp::{gpio, Peripherals}; +use embassy_rp::{gpio, spi, Peripherals}; use gpio::{Level, Output}; - -use defmt_rtt as _; // global logger -use panic_probe as _; +use {defmt_rtt as _, panic_probe as _}; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs index 5c3c4c4c5..f4a411ba6 100644 --- a/examples/rp/src/bin/spi_display.rs +++ b/examples/rp/src/bin/spi_display.rs @@ -3,13 +3,13 @@ #![feature(type_alias_impl_trait)] use core::cell::RefCell; + use defmt::*; use embassy::executor::Spawner; use embassy::time::Delay; use embassy_rp::gpio::{Level, Output}; -use embassy_rp::spi; use embassy_rp::spi::Spi; -use embassy_rp::Peripherals; +use embassy_rp::{spi, Peripherals}; use embedded_graphics::image::{Image, ImageRawLE}; use embedded_graphics::mono_font::ascii::FONT_10X20; use embedded_graphics::mono_font::MonoTextStyle; @@ -18,14 +18,12 @@ use embedded_graphics::prelude::*; use embedded_graphics::primitives::{PrimitiveStyleBuilder, Rectangle}; use embedded_graphics::text::Text; use st7789::{Orientation, ST7789}; +use {defmt_rtt as _, panic_probe as _}; use crate::my_display_interface::SPIDeviceInterface; use crate::shared_spi::SpiDeviceWithCs; use crate::touch::Touch; -use defmt_rtt as _; // global logger -use panic_probe as _; - //const DISPLAY_FREQ: u32 = 64_000_000; const TOUCH_FREQ: u32 = 200_000; @@ -94,9 +92,7 @@ async fn main(_spawner: Spawner, p: Peripherals) { loop { if let Some((x, y)) = touch.read() { - let style = PrimitiveStyleBuilder::new() - .fill_color(Rgb565::BLUE) - .build(); + let style = PrimitiveStyleBuilder::new().fill_color(Rgb565::BLUE).build(); Rectangle::new(Point::new(x - 1, y - 1), Size::new(3, 3)) .into_styled(style) diff --git a/examples/rp/src/bin/uart.rs b/examples/rp/src/bin/uart.rs index bc941dd8b..99072253a 100644 --- a/examples/rp/src/bin/uart.rs +++ b/examples/rp/src/bin/uart.rs @@ -4,9 +4,7 @@ use embassy::executor::Spawner; use embassy_rp::{uart, Peripherals}; - -use defmt_rtt as _; // global logger -use panic_probe as _; +use {defmt_rtt as _, panic_probe as _}; #[embassy::main] async fn main(_spawner: Spawner, p: Peripherals) { -- cgit