format

kiffie · Jun 9, 2023 · cfe49f2 · cfe49f2
1 parent e453f08
commit cfe49f2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/mips-mcu-alloc/src/lib.rs b/mips-mcu-alloc/src/lib.rs
@@ -46,9 +46,9 @@ use core::arch::asm;
 use core::cell::RefCell;
 use core::ptr::{self, NonNull};
 
+use critical_section::{self, Mutex};
 use linked_list_allocator::Heap;
 use mips_rt::heap_start;
-use critical_section::{self, Mutex};
 
 /// Heap extension is performed stepwise. This constant defines the size of one extension step.
 const EXTEND_INCREMENT: usize = 1024;
@@ -107,10 +107,7 @@ unsafe impl GlobalAlloc for MipsMcuHeap {
         // try to allocate and successively extend by EXTEND_INCREMENT until memory is exhausted
         loop {
             if let Ok(p) = critical_section::with(|cs| {
-                self.heap
-                    .borrow(cs)
-                    .borrow_mut()
-                    .allocate_first_fit(layout)
+                self.heap.borrow(cs).borrow_mut().allocate_first_fit(layout)
             }) {
                 break p.as_ptr();
             } else {

diff --git a/mips-mcu/src/interrupt.rs b/mips-mcu/src/interrupt.rs
@@ -10,7 +10,9 @@ pub fn enable_mv_irq() {
     extern "C" {
         fn mips_enable_mv_irq();
     }
-    unsafe { mips_enable_mv_irq(); }
+    unsafe {
+        mips_enable_mv_irq();
+    }
 }
 
 /// Disables all interrupts and return previous status

diff --git a/pic32-hal/src/coretimer.rs b/pic32-hal/src/coretimer.rs
@@ -7,9 +7,9 @@ use crate::hal::blocking::delay::{DelayMs, DelayUs};
 use crate::pac::INT; // interrupt controller
 use crate::time::Hertz;
 
+use critical_section::Mutex;
 pub use mips_mcu::core_timer::read_count;
 use mips_mcu::core_timer::{read_compare, write_compare};
-use critical_section::Mutex;
 
 use core::cell::Cell;
 

diff --git a/pic32-hal/src/gpio.rs b/pic32-hal/src/gpio.rs
@@ -259,10 +259,7 @@ macro_rules! port {
 }
 
 // configuration for general purpose (non-USB) devices
-#[cfg(any(
-    feature = "pic32mx1xxfxxxb",
-    feature = "pic32mx2xxfxxxb"
-))]
+#[cfg(any(feature = "pic32mx1xxfxxxb", feature = "pic32mx2xxfxxxb"))]
 port!(PORTA, porta, [
     RA0: (ra0, 0, Input<Analog>, true),
     RA1: (ra1, 1, Input<Analog>, true),

diff --git a/pic32-hal/src/int.rs b/pic32-hal/src/int.rs
@@ -3,7 +3,7 @@
 //! Enable/disable and set priorities of interrupts in Multi-vectored mode
 
 use crate::pac::INT;
-use crate::pac_crate::{RegisterSpec, Reg};
+use crate::pac_crate::{Reg, RegisterSpec};
 use core::convert::TryFrom;
 use core::marker::PhantomData;
 use core::ptr::{read_volatile, write_volatile};

diff --git a/pic32-hal/src/lib.rs b/pic32-hal/src/lib.rs
@@ -32,17 +32,17 @@ pub use pic32mx4xxfxxxh as pac;
 
 use embedded_hal as hal;
 
-pub mod time;
-pub mod int;
+pub mod adc;
+pub mod clock;
+pub mod coretimer;
+pub mod dma;
 pub mod gpio;
+pub mod i2c;
+pub mod int;
 pub mod pps;
-pub mod uart;
 pub mod spi;
-pub mod i2c;
-pub mod coretimer;
-pub mod clock;
-pub mod dma;
-pub mod adc;
+pub mod time;
+pub mod uart;
 
 #[cfg(any(
     feature = "pic32mx2xxfxxxb",

diff --git a/pic32-hal/src/uart.rs b/pic32-hal/src/uart.rs
@@ -4,8 +4,8 @@ use core::fmt;
 use core::marker::PhantomData;
 
 use crate::clock::Osc;
-use crate::pps::{input, output, MappedPin, IsConnected};
 use crate::pac::{UART1, UART2};
+use crate::pps::{input, output, IsConnected, MappedPin};
 
 use embedded_hal::prelude::*;
 use nb::block;