fix rustc-1.89 warnings

This commit is contained in:
bunnie 2025-08-19 19:45:29 +08:00
parent 364efcb67a
commit ecbac27e76
21 changed files with 31 additions and 18 deletions

View file

@ -85,20 +85,19 @@ pub fn next_u64() -> u64 {
} }
pub fn fill_bytes_via_next(dest: &mut [MaybeUninit<u8>]) { pub fn fill_bytes_via_next(dest: &mut [MaybeUninit<u8>]) {
use core::mem::transmute;
let mut left = dest; let mut left = dest;
while left.len() >= 8 { while left.len() >= 8 {
let (l, r) = { left }.split_at_mut(8); let (l, r) = { left }.split_at_mut(8);
left = r; 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)); l.copy_from_slice(slice_as_uninit(&chunk));
} }
let n = left.len(); let n = left.len();
if n > 4 { 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])); left.copy_from_slice(slice_as_uninit(&chunk[..n]));
} else if n > 0 { } 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])); left.copy_from_slice(slice_as_uninit(&chunk[..n]));
} }
} }

View file

@ -21,6 +21,7 @@ enum ClaimReleaseMove {
Move(PID /* from */), Move(PID /* from */),
} }
#[allow(dead_code)]
#[repr(C)] #[repr(C)]
pub struct MemoryRangeExtra { pub struct MemoryRangeExtra {
mem_start: u32, mem_start: u32,

View file

@ -2192,7 +2192,7 @@ impl CorigineWrapper {
c c
} }
pub fn core(&self) -> std::sync::MutexGuard<CorigineUsb> { pub fn core(&self) -> std::sync::MutexGuard<'_, CorigineUsb> {
#[cfg(feature = "verbose-debug")] #[cfg(feature = "verbose-debug")]
crate::println!("lock status: {}", if self.hw.try_lock().is_err() { "locked " } else { "unlocked" }); crate::println!("lock status: {}", if self.hw.try_lock().is_err() { "locked " } else { "unlocked" });
self.hw.lock().unwrap() self.hw.lock().unwrap()

View file

@ -172,12 +172,14 @@ macro_rules! define_aes_impl {
#[doc=$doc] #[doc=$doc]
///block cipher (decrypt-only) ///block cipher (decrypt-only)
#[derive(Clone)] #[derive(Clone)]
#[allow(dead_code)]
pub struct $name_dec { pub struct $name_dec {
inner: $name, inner: $name,
} }
impl $name_dec { impl $name_dec {
#[inline(always)] #[inline(always)]
#[allow(dead_code)]
pub(crate) fn get_dec_backend(&self) -> $name_back_dec<'_> { self.inner.get_dec_backend() } pub(crate) fn get_dec_backend(&self) -> $name_back_dec<'_> { self.inner.get_dec_backend() }
} }

View file

@ -83,20 +83,19 @@ impl Trng {
/// This is copied out of the 0.5 API for rand_core /// This is copied out of the 0.5 API for rand_core
pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) { pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) {
use core::mem::transmute;
let mut left = dest; let mut left = dest;
while left.len() >= 8 { while left.len() >= 8 {
let (l, r) = { left }.split_at_mut(8); let (l, r) = { left }.split_at_mut(8);
left = r; 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); l.copy_from_slice(&chunk);
} }
let n = left.len(); let n = left.len();
if n > 4 { 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]); left.copy_from_slice(&chunk[..n]);
} else if n > 0 { } 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]); left.copy_from_slice(&chunk[..n]);
} }
} }

View file

@ -10,6 +10,7 @@ pub(crate) const DNS_NAME_LENGTH_LIMIT: usize = 256;
pub(crate) const DNS_PKT_MAX_LEN: usize = 512; pub(crate) const DNS_PKT_MAX_LEN: usize = 512;
/// These opcodes can be called by anyone at any time /// These opcodes can be called by anyone at any time
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
#[repr(C)] #[repr(C)]
pub(crate) enum Opcode { pub(crate) enum Opcode {

View file

@ -828,6 +828,7 @@ pub(crate) fn start_time_ux() {
} }
// RTC Ux helper functions // RTC Ux helper functions
#[allow(dead_code)]
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub(crate) enum ValidatorOp { pub(crate) enum ValidatorOp {
UxMonth, UxMonth,

View file

@ -39,7 +39,7 @@ pub enum MenuOpcode {
} }
impl<'a> Menu<'a> { impl<'a> Menu<'a> {
pub fn new(name: &str) -> Menu { pub fn new(name: &str) -> Menu<'_> {
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
let sid = xous::create_server().expect("can't create private menu message server"); let sid = xous::create_server().expect("can't create private menu message server");
let gam = Gam::new(&xns).expect("can't connect to GAM"); let gam = Gam::new(&xns).expect("can't connect to GAM");

View file

@ -26,6 +26,7 @@ pub enum I2cStatus {
/// interrupt handler error /// interrupt handler error
ResponseInterruptError, ResponseInterruptError,
} }
#[allow(dead_code)]
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub(crate) enum I2cCallback { pub(crate) enum I2cCallback {
Result, Result,

View file

@ -12,6 +12,7 @@ pub struct Validation {
pub text: TextEntryPayload, pub text: TextEntryPayload,
pub opcode: u32, pub opcode: u32,
} }
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum ValidationOp { pub(crate) enum ValidationOp {
Validate, Validate,

View file

@ -198,7 +198,7 @@ impl Modals {
Ok(Modals { conn, token, have_lock: Cell::new(false) }) 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 { AlertModalBuilder {
prompt: String::from(prompt), prompt: String::from(prompt),
validators: vec![], validators: vec![],

View file

@ -387,6 +387,7 @@ pub(crate) struct SsidList {
/// These opcodes are reserved for private SIDs shared from a DNS server to /// These opcodes are reserved for private SIDs shared from a DNS server to
/// reconfigure DNS on IP change/update. /// reconfigure DNS on IP change/update.
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum PrivateDnsOp { pub(crate) enum PrivateDnsOp {
AddIpv4DnsServer, AddIpv4DnsServer,
@ -408,6 +409,7 @@ pub(crate) struct WifiStateSubscription {
pub opcode: u32, pub opcode: u32,
} }
#[allow(dead_code)]
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub(crate) enum NetCallback { pub(crate) enum NetCallback {
Ping, Ping,

View file

@ -32,6 +32,7 @@ pub(crate) struct NetTcpListenCallback {
pub(crate) local_port: u16, pub(crate) local_port: u16,
} }
#[allow(dead_code)]
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub(crate) enum NetTcpCallback { pub(crate) enum NetTcpCallback {
RxData, RxData,

View file

@ -54,6 +54,7 @@ const PING_IDENT: u16 = 0x22b;
/// so the poll interval should be OK to be set quite high. /// so the poll interval should be OK to be set quite high.
const NET_DEFAULT_POLL_MS: u64 = 900; const NET_DEFAULT_POLL_MS: u64 = 900;
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
enum WaitOp { enum WaitOp {
WaitMs, WaitMs,

View file

@ -446,7 +446,7 @@ impl Pddb {
create_key: bool, create_key: bool,
alloc_hint: Option<usize>, alloc_hint: Option<usize>,
key_changed_cb: Option<impl Fn() + 'static + Send>, key_changed_cb: Option<impl Fn() + 'static + Send>,
) -> Result<PddbKey> { ) -> Result<PddbKey<'_>> {
if key_name.len() > (KEY_NAME_LEN - 1) { if key_name.len() > (KEY_NAME_LEN - 1) {
return Err(Error::new(ErrorKind::InvalidInput, "key name too long")); return Err(Error::new(ErrorKind::InvalidInput, "key name too long"));
} }

View file

@ -153,7 +153,7 @@ pub trait Senres {
fn can_create_writer(&self) -> bool { true } fn can_create_writer(&self) -> bool { true }
fn reader(&self, fourcc: [u8; 4]) -> Option<Reader<Self>> fn reader(&self, fourcc: [u8; 4]) -> Option<Reader<'_, Self>>
where where
Self: core::marker::Sized, Self: core::marker::Sized,
{ {
@ -207,7 +207,7 @@ pub trait Senres {
pub trait SenresMut: Senres { pub trait SenresMut: Senres {
fn as_mut_slice(&mut self) -> &mut [u8]; fn as_mut_slice(&mut self) -> &mut [u8];
fn as_mut_ptr(&mut self) -> *mut u8; fn as_mut_ptr(&mut self) -> *mut u8;
fn writer(&mut self, fourcc: [u8; 4]) -> Option<Writer<Self>> fn writer(&mut self, fourcc: [u8; 4]) -> Option<Writer<'_, Self>>
where where
Self: core::marker::Sized, Self: core::marker::Sized,
{ {

View file

@ -165,6 +165,7 @@ pub(crate) fn password_ux_manager(
xous::destroy_server(ux_sid).unwrap(); xous::destroy_server(ux_sid).unwrap();
} }
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum UxOpcode { pub(crate) enum UxOpcode {
// add UX opcodes here, separate from the main loop's // add UX opcodes here, separate from the main loop's

View file

@ -104,6 +104,7 @@ impl Test {
const SAMPLE_RATE_HZ: f32 = 8000.0; const SAMPLE_RATE_HZ: f32 = 8000.0;
// note to self: A4 = 440.0, E4 = 329.63, C4 = 261.63 // note to self: A4 = 440.0, E4 = 329.63, C4 = 261.63
#[allow(dead_code)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
enum TestOp { enum TestOp {
KeyCode, KeyCode,

View file

@ -41,6 +41,7 @@ pub(crate) enum Opcode {
// Erase/Write are uninterruptable operations. Split suspend/resume // Erase/Write are uninterruptable operations. Split suspend/resume
// into a separate server to asynchronously manage this. // into a separate server to asynchronously manage this.
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
#[allow(dead_code)]
pub(crate) enum SusResOps { pub(crate) enum SusResOps {
/// Suspend/resume callback /// Suspend/resume callback
SuspendResume, SuspendResume,

View file

@ -115,20 +115,19 @@ impl Trng {
/// This is copied out of the 0.5 API for rand_core /// This is copied out of the 0.5 API for rand_core
pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) { pub fn fill_bytes_via_next(&mut self, dest: &mut [u8]) {
use core::mem::transmute;
let mut left = dest; let mut left = dest;
while left.len() >= 8 { while left.len() >= 8 {
let (l, r) = { left }.split_at_mut(8); let (l, r) = { left }.split_at_mut(8);
left = r; 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); l.copy_from_slice(&chunk);
} }
let n = left.len(); let n = left.len();
if n > 4 { 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]); left.copy_from_slice(&chunk[..n]);
} else if n > 0 { } 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]); left.copy_from_slice(&chunk[..n]);
} }
} }

View file

@ -117,6 +117,7 @@ pub enum U2fCode {
Denied, Denied,
} }
#[allow(dead_code)]
#[derive(Eq, PartialEq, Copy, Clone)] #[derive(Eq, PartialEq, Copy, Clone)]
#[repr(usize)] #[repr(usize)]
pub enum UsbDeviceType { pub enum UsbDeviceType {
@ -188,6 +189,7 @@ pub(crate) struct UsbListenerRegistration {
pub listener_op_id: usize, pub listener_op_id: usize,
} }
#[allow(dead_code)]
#[derive(Debug, Eq, PartialEq, Copy, Clone)] #[derive(Debug, Eq, PartialEq, Copy, Clone)]
#[repr(usize)] #[repr(usize)]
pub enum LogLevel { pub enum LogLevel {