From 0c50581e9c6a7aa5b46ad868b26d0c417024da65 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 15 Jan 2024 00:43:52 +0800 Subject: [PATCH] more rustfmt-related fixes --- libs/xous-pio/src/lib.rs | 4 ++-- libs/xous-pl230/src/pl230_tests/units.rs | 9 ++++++--- services/xous-log/src/platform/cramium/implementation.rs | 1 + utralib/src/generated/cramium_fpga.rs | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/xous-pio/src/lib.rs b/libs/xous-pio/src/lib.rs index ee571a50e..48477fb7d 100644 --- a/libs/xous-pio/src/lib.rs +++ b/libs/xous-pio/src/lib.rs @@ -92,7 +92,7 @@ impl LoadedProg { pio_sm: &mut PioSharedState, ) -> Result { let offset = pio_sm.add_program(&program)?; - Ok({ LoadedProg { program, offset: offset as usize, entry_point: None } }) + Ok(LoadedProg { program, offset: offset as usize, entry_point: None }) } pub fn load_with_entrypoint( @@ -101,7 +101,7 @@ impl LoadedProg { pio_sm: &mut PioSharedState, ) -> Result { let offset = pio_sm.add_program(&program)?; - Ok({ LoadedProg { program, offset: offset as usize, entry_point: Some(entry_point) } }) + Ok(LoadedProg { program, offset: offset as usize, entry_point: Some(entry_point) }) } pub fn entry(&self) -> usize { diff --git a/libs/xous-pl230/src/pl230_tests/units.rs b/libs/xous-pl230/src/pl230_tests/units.rs index b0e88a0ca..08799fea4 100644 --- a/libs/xous-pl230/src/pl230_tests/units.rs +++ b/libs/xous-pl230/src/pl230_tests/units.rs @@ -85,15 +85,18 @@ pub fn basic_tests(pl230: &mut Pl230) -> bool { report_api("progress as baseptr[2]", unsafe { cc_struct.channels.as_ptr().read() }.control); timeout += 1; } - #[rustfmt::skip] - unsafe {core::arch::asm!( + + unsafe { + #[rustfmt::skip] + core::arch::asm!( ".word 0x500F", "nop", "nop", "nop", "nop", "nop", - ); } + ); + } // manual flushing, as a sanity check of cache flush if needed /* diff --git a/services/xous-log/src/platform/cramium/implementation.rs b/services/xous-log/src/platform/cramium/implementation.rs index b0f3a27a3..844d71835 100644 --- a/services/xous-log/src/platform/cramium/implementation.rs +++ b/services/xous-log/src/platform/cramium/implementation.rs @@ -170,6 +170,7 @@ fn handle_console_irq(_irq_no: usize, arg: *mut usize) { pub struct OutputWriter {} +#[allow(dead_code)] impl OutputWriter { pub fn putc(&self, c: u8) { #[cfg(feature = "cramium-fpga")] diff --git a/utralib/src/generated/cramium_fpga.rs b/utralib/src/generated/cramium_fpga.rs index 1e73e8640..95f7247fa 100644 --- a/utralib/src/generated/cramium_fpga.rs +++ b/utralib/src/generated/cramium_fpga.rs @@ -1,4 +1,5 @@ +#![cfg_attr(rustfmt, rustfmt_skip)] // don't format generated files #![allow(dead_code)] use core::convert::TryInto; #[cfg(feature="std")]