From 85fdb7453db10cdf209ca181f56bb1be2f49f531 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 1 Apr 2021 17:24:13 +0800 Subject: [PATCH] remove unused code --- services/log-server/src/log_string.rs | 57 --------------------------- 1 file changed, 57 deletions(-) delete mode 100644 services/log-server/src/log_string.rs diff --git a/services/log-server/src/log_string.rs b/services/log-server/src/log_string.rs deleted file mode 100644 index 53c07ffda..000000000 --- a/services/log-server/src/log_string.rs +++ /dev/null @@ -1,57 +0,0 @@ -use core::fmt; -use core::slice; - -pub struct LogString<'a> { - raw_slice: &'a mut [u8], - pub s: &'a str, - pub len: u32, - msg_len: &'a mut Option, -} - -impl<'a> LogString<'a> { - pub fn from_message(message: &'a mut xous::MemoryMessage) -> LogString<'a> { - // println!("LOG: Message address is at {:08x} (whole message: {:?})", message.buf.addr.get(), message); - let raw_slice = unsafe { slice::from_raw_parts_mut(message.buf.as_ptr() as *mut u8, message.buf.len() as usize) }; - let starting_length = message.valid.map(|x| x.get()).unwrap_or(0); - - // print!("LOG: String @ {:08x}:", message.buf.as_ptr() as usize); - // for offset in 0..starting_length { - // print!(" {:02x}", raw_slice[offset]); - // } - // println!(" (length: {})", starting_length); - - LogString { - s: unsafe { - core::str::from_utf8_unchecked(slice::from_raw_parts( - message.buf.as_ptr() as *mut u8, - starting_length, - )) - }, - len: starting_length as u32, - raw_slice, - msg_len: &mut message.valid, - } - } -} - -impl<'a> fmt::Display for LogString<'a> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{}", self.s) - } -} - -impl<'a> fmt::Write for LogString<'a> { - fn write_str(&mut self, s: &str) -> Result<(), fmt::Error> { - for c in s.bytes() { - if self.len as usize < self.raw_slice.len() { - self.raw_slice[self.len as usize] = c; - self.len += 1; - } - } - self.s = unsafe { - core::str::from_utf8_unchecked(slice::from_raw_parts(self.raw_slice.as_ptr(), self.len as usize)) - }; - *self.msg_len = Some(xous::MemorySize::new(self.len as usize).unwrap()); - Ok(()) - } -}