From 65aef1c886b1fd553aba3924f7709fadfe3f3be6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 14 Jan 2024 18:50:49 +0800 Subject: [PATCH] format xous-api-log --- api/xous-api-log/src/api.rs | 14 ++++++++++++-- api/xous-api-log/src/cursor.rs | 12 +++--------- api/xous-api-log/src/lib.rs | 28 ++++++++-------------------- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/api/xous-api-log/src/api.rs b/api/xous-api-log/src/api.rs index b0f64ffea..cdee1fc56 100644 --- a/api/xous-api-log/src/api.rs +++ b/api/xous-api-log/src/api.rs @@ -12,7 +12,16 @@ pub struct LogRecord { impl Default for LogRecord { fn default() -> Self { - LogRecord { file_length: 0, file: [0u8; 128], line: None, module_length: 0, module: [0u8; 128], level: 0, args_length: 0, args: [0u8; 3820] } + LogRecord { + file_length: 0, + file: [0u8; 128], + line: None, + module_length: 0, + module: [0u8; 128], + level: 0, + args_length: 0, + args: [0u8; 3820], + } } } @@ -30,7 +39,8 @@ pub enum Opcode { /// A `xous::StringBuffer` containing this program's name ProgramName = 3, - /// Try to log console output to a USB serial port. Best-effort only; failures will not crash, will not be noted + /// Try to log console output to a USB serial port. Best-effort only; failures will not crash, will not + /// be noted TryHookUsbMirror = 4, UnhookUsbMirror = 5, diff --git a/api/xous-api-log/src/cursor.rs b/api/xous-api-log/src/cursor.rs index 0d5f660db..0378a8802 100644 --- a/api/xous-api-log/src/cursor.rs +++ b/api/xous-api-log/src/cursor.rs @@ -6,15 +6,9 @@ pub struct BufferWrapper<'a> { } impl<'a> BufferWrapper<'a> { - pub fn new(buf: &'a mut [u8]) -> Self { - BufferWrapper { - buf: buf, - offset: 0, - } - } - pub fn len(&self) -> usize { - self.offset - } + pub fn new(buf: &'a mut [u8]) -> Self { BufferWrapper { buf, offset: 0 } } + + pub fn len(&self) -> usize { self.offset } } impl<'a> core::fmt::Write for BufferWrapper<'a> { diff --git a/api/xous-api-log/src/lib.rs b/api/xous-api-log/src/lib.rs index 282c5d0f6..1971cfb41 100644 --- a/api/xous-api-log/src/lib.rs +++ b/api/xous-api-log/src/lib.rs @@ -1,6 +1,7 @@ #![cfg_attr(any(target_os = "none", feature = "nostd"), no_std)] use core::fmt::Write; use core::sync::atomic::{AtomicU32, Ordering}; + use num_traits::ToPrimitive; pub mod api; @@ -53,12 +54,7 @@ impl XousLogger { xous::send_message( XOUS_LOGGER_CONNECTION.load(Ordering::Relaxed), - xous::Message::new_lend( - crate::api::Opcode::LogRecord.to_usize().unwrap(), - buf, - None, - None, - ), + xous::Message::new_lend(crate::api::Opcode::LogRecord.to_usize().unwrap(), buf, None, None), ) .unwrap(); } @@ -66,20 +62,17 @@ impl XousLogger { fn resume(&self) { xous::send_message( XOUS_LOGGER_CONNECTION.load(Ordering::Relaxed), - xous::Message::new_scalar(2000, 0, 0, 0, 0), // logger is one of the few servers that uses special, non-encoded message IDs. + xous::Message::new_scalar(2000, 0, 0, 0, 0), /* logger is one of the few servers that uses + * special, non-encoded message IDs. */ ) .expect("couldn't send resume message to the logger implementation"); } } impl log::Log for XousLogger { - fn enabled(&self, _metadata: &log::Metadata) -> bool { - true - } + fn enabled(&self, _metadata: &log::Metadata) -> bool { true } - fn log(&self, record: &log::Record) { - XOUS_LOGGER.log_impl(record); - } + fn log(&self, record: &log::Record) { XOUS_LOGGER.log_impl(record); } fn flush(&self) {} } @@ -98,15 +91,10 @@ pub fn init() -> Result<(), LogError> { pub fn init_wait() -> Result<(), ()> { let sid = xous::SID::from_bytes(b"xous-log-server ").unwrap(); let cid = xous::connect(sid).or(Err(()))?; - XOUS_LOGGER_CONNECTION.store( - cid, - Ordering::Relaxed, - ); + XOUS_LOGGER_CONNECTION.store(cid, Ordering::Relaxed); log::set_logger(&XOUS_LOGGER).or(Err(()))?; log::set_max_level(log::LevelFilter::Info); Ok(()) } -pub fn resume() { - XOUS_LOGGER.resume(); -} +pub fn resume() { XOUS_LOGGER.resume(); }