From ecbac27e762665cae464577c026dc6bc7ab7e1f2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 19 Aug 2025 19:45:29 +0800 Subject: [PATCH] fix rustc-1.89 warnings --- imports/getrandom/src/xous.rs | 7 +++---- kernel/src/mem.rs | 1 + libs/cramium-hal/src/usb/driver.rs | 2 +- services/aes/src/soft.rs | 2 ++ services/cram-hal-service/src/trng.rs | 7 +++---- services/dns/src/api.rs | 1 + services/dns/src/time.rs | 1 + services/gam/src/menu.rs | 2 +- services/llio/src/api/i2c_api.rs | 1 + services/modals/src/api.rs | 1 + services/modals/src/lib.rs | 2 +- services/net/src/api.rs | 2 ++ services/net/src/api/tcp.rs | 1 + services/net/src/main.rs | 1 + services/pddb/src/lib.rs | 2 +- services/pddb/src/libstd/senres.rs | 4 ++-- services/pddb/src/ux.rs | 1 + services/shellchat/src/cmds/test.rs | 1 + services/spinor/src/api.rs | 1 + services/trng/src/lib.rs | 7 +++---- services/usb-device-xous/src/api.rs | 2 ++ 21 files changed, 31 insertions(+), 18 deletions(-) diff --git a/imports/getrandom/src/xous.rs b/imports/getrandom/src/xous.rs index c493f73d4..9c0810532 100644 --- a/imports/getrandom/src/xous.rs +++ b/imports/getrandom/src/xous.rs @@ -85,20 +85,19 @@ pub fn next_u64() -> u64 { } pub fn fill_bytes_via_next(dest: &mut [MaybeUninit]) { - use core::mem::transmute; let mut left = dest; while left.len() >= 8 { let (l, r) = { left }.split_at_mut(8); left = r; - let chunk: [u8; 8] = unsafe { transmute(next_u64().to_le()) }; + let chunk: [u8; 8] = next_u64().to_ne_bytes(); l.copy_from_slice(slice_as_uninit(&chunk)); } let n = left.len(); if n > 4 { - let chunk: [u8; 8] = unsafe { transmute(next_u64().to_le()) }; + let chunk: [u8; 8] = next_u64().to_ne_bytes(); left.copy_from_slice(slice_as_uninit(&chunk[..n])); } else if n > 0 { - let chunk: [u8; 4] = unsafe { transmute(next_u32().to_le()) }; + let chunk: [u8; 4] = next_u32().to_ne_bytes(); left.copy_from_slice(slice_as_uninit(&chunk[..n])); } } diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 72c62af99..4c2fcf6d9 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -21,6 +21,7 @@ enum ClaimReleaseMove { Move(PID /* from */), } +#[allow(dead_code)] #[repr(C)] pub struct MemoryRangeExtra { mem_start: u32, diff --git a/libs/cramium-hal/src/usb/driver.rs b/libs/cramium-hal/src/usb/driver.rs index 7cc2acbc2..93b3eb47a 100644 --- a/libs/cramium-hal/src/usb/driver.rs +++ b/libs/cramium-hal/src/usb/driver.rs @@ -2192,7 +2192,7 @@ impl CorigineWrapper { c } - pub fn core(&self) -> std::sync::MutexGuard { + pub fn core(&self) -> std::sync::MutexGuard<'_, CorigineUsb> { #[cfg(feature = "verbose-debug")] crate::println!("lock status: {}", if self.hw.try_lock().is_err() { "locked " } else { "unlocked" }); self.hw.lock().unwrap() diff --git a/services/aes/src/soft.rs b/services/aes/src/soft.rs index a75a99b78..2268d7f8d 100644 --- a/services/aes/src/soft.rs +++ b/services/aes/src/soft.rs @@ -172,12 +172,14 @@ macro_rules! define_aes_impl { #[doc=$doc] ///block cipher (decrypt-only) #[derive(Clone)] + #[allow(dead_code)] pub struct $name_dec { inner: $name, } impl $name_dec { #[inline(always)] + #[allow(dead_code)] pub(crate) fn get_dec_backend(&self) -> $name_back_dec<'_> { self.inner.get_dec_backend() } } diff --git a/services/cram-hal-service/src/trng.rs b/services/cram-hal-service/src/trng.rs index bf8316be5..1f0489064 100644 --- a/services/cram-hal-service/src/trng.rs +++ b/services/cram-hal-service/src/trng.rs @@ -83,20 +83,19 @@ impl Trng { /// This is copied out of the 0.5 API for rand_core pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) { - use core::mem::transmute; let mut left = dest; while left.len() >= 8 { let (l, r) = { left }.split_at_mut(8); left = r; - let chunk: [u8; 8] = unsafe { transmute(self.next_u64().to_le()) }; + let chunk: [u8; 8] = self.next_u64().to_ne_bytes(); l.copy_from_slice(&chunk); } let n = left.len(); if n > 4 { - let chunk: [u8; 8] = unsafe { transmute(self.next_u64().to_le()) }; + let chunk: [u8; 8] = self.next_u64().to_ne_bytes(); left.copy_from_slice(&chunk[..n]); } else if n > 0 { - let chunk: [u8; 4] = unsafe { transmute(self.next_u32().to_le()) }; + let chunk: [u8; 4] = self.next_u32().to_ne_bytes(); left.copy_from_slice(&chunk[..n]); } } diff --git a/services/dns/src/api.rs b/services/dns/src/api.rs index 69ba1136c..28055e252 100644 --- a/services/dns/src/api.rs +++ b/services/dns/src/api.rs @@ -10,6 +10,7 @@ pub(crate) const DNS_NAME_LENGTH_LIMIT: usize = 256; pub(crate) const DNS_PKT_MAX_LEN: usize = 512; /// These opcodes can be called by anyone at any time +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[repr(C)] pub(crate) enum Opcode { diff --git a/services/dns/src/time.rs b/services/dns/src/time.rs index d391c1283..04fbfd1d1 100644 --- a/services/dns/src/time.rs +++ b/services/dns/src/time.rs @@ -828,6 +828,7 @@ pub(crate) fn start_time_ux() { } // RTC Ux helper functions +#[allow(dead_code)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub(crate) enum ValidatorOp { UxMonth, diff --git a/services/gam/src/menu.rs b/services/gam/src/menu.rs index 6e717ad83..5d5a47edf 100644 --- a/services/gam/src/menu.rs +++ b/services/gam/src/menu.rs @@ -39,7 +39,7 @@ pub enum MenuOpcode { } impl<'a> Menu<'a> { - pub fn new(name: &str) -> Menu { + pub fn new(name: &str) -> Menu<'_> { let xns = xous_names::XousNames::new().unwrap(); let sid = xous::create_server().expect("can't create private menu message server"); let gam = Gam::new(&xns).expect("can't connect to GAM"); diff --git a/services/llio/src/api/i2c_api.rs b/services/llio/src/api/i2c_api.rs index 0366ad3ec..d077ba2d7 100644 --- a/services/llio/src/api/i2c_api.rs +++ b/services/llio/src/api/i2c_api.rs @@ -26,6 +26,7 @@ pub enum I2cStatus { /// interrupt handler error ResponseInterruptError, } +#[allow(dead_code)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub(crate) enum I2cCallback { Result, diff --git a/services/modals/src/api.rs b/services/modals/src/api.rs index 661ac75ab..265b76b1b 100644 --- a/services/modals/src/api.rs +++ b/services/modals/src/api.rs @@ -12,6 +12,7 @@ pub struct Validation { pub text: TextEntryPayload, pub opcode: u32, } +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] pub(crate) enum ValidationOp { Validate, diff --git a/services/modals/src/lib.rs b/services/modals/src/lib.rs index 17ad3a38b..fa0dd0072 100644 --- a/services/modals/src/lib.rs +++ b/services/modals/src/lib.rs @@ -198,7 +198,7 @@ impl Modals { Ok(Modals { conn, token, have_lock: Cell::new(false) }) } - pub fn alert_builder(&self, prompt: &str) -> AlertModalBuilder { + pub fn alert_builder(&self, prompt: &str) -> AlertModalBuilder<'_> { AlertModalBuilder { prompt: String::from(prompt), validators: vec![], diff --git a/services/net/src/api.rs b/services/net/src/api.rs index 6b1beb707..e7651d0f8 100644 --- a/services/net/src/api.rs +++ b/services/net/src/api.rs @@ -387,6 +387,7 @@ pub(crate) struct SsidList { /// These opcodes are reserved for private SIDs shared from a DNS server to /// reconfigure DNS on IP change/update. +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] pub(crate) enum PrivateDnsOp { AddIpv4DnsServer, @@ -408,6 +409,7 @@ pub(crate) struct WifiStateSubscription { pub opcode: u32, } +#[allow(dead_code)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub(crate) enum NetCallback { Ping, diff --git a/services/net/src/api/tcp.rs b/services/net/src/api/tcp.rs index e0453610a..a071eca53 100644 --- a/services/net/src/api/tcp.rs +++ b/services/net/src/api/tcp.rs @@ -32,6 +32,7 @@ pub(crate) struct NetTcpListenCallback { pub(crate) local_port: u16, } +#[allow(dead_code)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub(crate) enum NetTcpCallback { RxData, diff --git a/services/net/src/main.rs b/services/net/src/main.rs index fc45b7067..a98b226a6 100644 --- a/services/net/src/main.rs +++ b/services/net/src/main.rs @@ -54,6 +54,7 @@ const PING_IDENT: u16 = 0x22b; /// so the poll interval should be OK to be set quite high. const NET_DEFAULT_POLL_MS: u64 = 900; +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] enum WaitOp { WaitMs, diff --git a/services/pddb/src/lib.rs b/services/pddb/src/lib.rs index 8c00e7807..5f824276e 100644 --- a/services/pddb/src/lib.rs +++ b/services/pddb/src/lib.rs @@ -446,7 +446,7 @@ impl Pddb { create_key: bool, alloc_hint: Option, key_changed_cb: Option, - ) -> Result { + ) -> Result> { if key_name.len() > (KEY_NAME_LEN - 1) { return Err(Error::new(ErrorKind::InvalidInput, "key name too long")); } diff --git a/services/pddb/src/libstd/senres.rs b/services/pddb/src/libstd/senres.rs index 1827830f0..0eba97d99 100644 --- a/services/pddb/src/libstd/senres.rs +++ b/services/pddb/src/libstd/senres.rs @@ -153,7 +153,7 @@ pub trait Senres { fn can_create_writer(&self) -> bool { true } - fn reader(&self, fourcc: [u8; 4]) -> Option> + fn reader(&self, fourcc: [u8; 4]) -> Option> where Self: core::marker::Sized, { @@ -207,7 +207,7 @@ pub trait Senres { pub trait SenresMut: Senres { fn as_mut_slice(&mut self) -> &mut [u8]; fn as_mut_ptr(&mut self) -> *mut u8; - fn writer(&mut self, fourcc: [u8; 4]) -> Option> + fn writer(&mut self, fourcc: [u8; 4]) -> Option> where Self: core::marker::Sized, { diff --git a/services/pddb/src/ux.rs b/services/pddb/src/ux.rs index be7741131..2c5b7e5bd 100644 --- a/services/pddb/src/ux.rs +++ b/services/pddb/src/ux.rs @@ -165,6 +165,7 @@ pub(crate) fn password_ux_manager( xous::destroy_server(ux_sid).unwrap(); } +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] pub(crate) enum UxOpcode { // add UX opcodes here, separate from the main loop's diff --git a/services/shellchat/src/cmds/test.rs b/services/shellchat/src/cmds/test.rs index 655014372..6ea3e642e 100644 --- a/services/shellchat/src/cmds/test.rs +++ b/services/shellchat/src/cmds/test.rs @@ -104,6 +104,7 @@ impl Test { const SAMPLE_RATE_HZ: f32 = 8000.0; // note to self: A4 = 440.0, E4 = 329.63, C4 = 261.63 +#[allow(dead_code)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] enum TestOp { KeyCode, diff --git a/services/spinor/src/api.rs b/services/spinor/src/api.rs index 636daaaf3..c3d3fb374 100644 --- a/services/spinor/src/api.rs +++ b/services/spinor/src/api.rs @@ -41,6 +41,7 @@ pub(crate) enum Opcode { // Erase/Write are uninterruptable operations. Split suspend/resume // into a separate server to asynchronously manage this. #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] +#[allow(dead_code)] pub(crate) enum SusResOps { /// Suspend/resume callback SuspendResume, diff --git a/services/trng/src/lib.rs b/services/trng/src/lib.rs index c7fa7bfa3..18579f0a6 100644 --- a/services/trng/src/lib.rs +++ b/services/trng/src/lib.rs @@ -115,20 +115,19 @@ impl Trng { /// This is copied out of the 0.5 API for rand_core pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) { - use core::mem::transmute; let mut left = dest; while left.len() >= 8 { let (l, r) = { left }.split_at_mut(8); left = r; - let chunk: [u8; 8] = unsafe { transmute(self.next_u64().to_le()) }; + let chunk: [u8; 8] = self.next_u64().to_ne_bytes(); l.copy_from_slice(&chunk); } let n = left.len(); if n > 4 { - let chunk: [u8; 8] = unsafe { transmute(self.next_u64().to_le()) }; + let chunk: [u8; 8] = self.next_u64().to_ne_bytes(); left.copy_from_slice(&chunk[..n]); } else if n > 0 { - let chunk: [u8; 4] = unsafe { transmute(self.next_u32().to_le()) }; + let chunk: [u8; 4] = self.next_u32().to_ne_bytes(); left.copy_from_slice(&chunk[..n]); } } diff --git a/services/usb-device-xous/src/api.rs b/services/usb-device-xous/src/api.rs index 98090a0ad..0b7999c6b 100644 --- a/services/usb-device-xous/src/api.rs +++ b/services/usb-device-xous/src/api.rs @@ -117,6 +117,7 @@ pub enum U2fCode { Denied, } +#[allow(dead_code)] #[derive(Eq, PartialEq, Copy, Clone)] #[repr(usize)] pub enum UsbDeviceType { @@ -188,6 +189,7 @@ pub(crate) struct UsbListenerRegistration { pub listener_op_id: usize, } +#[allow(dead_code)] #[derive(Debug, Eq, PartialEq, Copy, Clone)] #[repr(usize)] pub enum LogLevel {