diff --git a/audiod/src/main.rs b/audiod/src/main.rs index 23ea550754..9f01a737f3 100644 --- a/audiod/src/main.rs +++ b/audiod/src/main.rs @@ -44,7 +44,8 @@ fn daemon(daemon: SchemeDaemon) -> anyhow::Result<()> { let mut sigaction = MaybeUninit::::uninit(); addr_of_mut!((*sigaction.as_mut_ptr()).sa_flags).write(0); libc::sigemptyset(addr_of_mut!((*sigaction.as_mut_ptr()).sa_mask)); - addr_of_mut!((*sigaction.as_mut_ptr()).sa_sigaction).write(sigusr_handler as usize); + addr_of_mut!((*sigaction.as_mut_ptr()).sa_sigaction) + .write(sigusr_handler as *const () as usize); sigaction.assume_init() }; libredox::call::sigaction(flag::SIGUSR1, Some(&new_sigaction), None)?; diff --git a/bootstrap/src/main.rs b/bootstrap/src/main.rs index f7dcd537cc..0e1d7907ce 100644 --- a/bootstrap/src/main.rs +++ b/bootstrap/src/main.rs @@ -1,7 +1,6 @@ #![no_std] #![no_main] -#![allow(internal_features)] -#![feature(core_intrinsics, str_from_raw_parts, never_type)] +#![feature(abort_immediate, never_type)] #[cfg(target_arch = "aarch64")] #[path = "aarch64.rs"] @@ -50,7 +49,7 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! { } let _ = writeln!(&mut Writer, "{}", info); - core::intrinsics::abort(); + core::process::abort_immediate(); } const HEAP_OFF: usize = arch::USERMODE_END / 2; diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs index 40309cc3d4..791a6966eb 100644 --- a/daemon/src/lib.rs +++ b/daemon/src/lib.rs @@ -2,7 +2,7 @@ #![feature(never_type)] use std::io::{self, PipeWriter, Read, Write}; -use std::os::fd::{AsRawFd, FromRawFd, OwnedFd, RawFd}; +use std::os::fd::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::process::CommandExt; use std::process::Command; diff --git a/drivers/input/ps2d/src/controller.rs b/drivers/input/ps2d/src/controller.rs index d7af4cba2c..30f4fe9f77 100644 --- a/drivers/input/ps2d/src/controller.rs +++ b/drivers/input/ps2d/src/controller.rs @@ -13,7 +13,7 @@ use common::io::Pio; #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))] use common::io::Mmio; -use log::{debug, error, info, trace, warn}; +use log::{debug, error, trace, warn}; use std::fmt; diff --git a/drivers/input/usbhidd/src/descs.rs b/drivers/input/usbhidd/src/descs.rs index 23742fcd14..0194f15564 100644 --- a/drivers/input/usbhidd/src/descs.rs +++ b/drivers/input/usbhidd/src/descs.rs @@ -41,17 +41,17 @@ impl HidDescriptor { let kind = bytes[1]; // A valid descriptor has at least one class descriptor - if (length < Self::HID_DESC_FIXED_SIZE + Self::HID_CLASS_DESC_SIZE) { + if length < Self::HID_DESC_FIXED_SIZE + Self::HID_CLASS_DESC_SIZE { return Err(anyhow!("Invalid length")); } - if (kind != HidClassType::HID as u8) { + if kind != HidClassType::HID as u8 { return Err(anyhow!("This is not a hid descriptor")); } let num_descriptors = bytes[5]; - if (length != Self::HID_DESC_FIXED_SIZE + num_descriptors * Self::HID_CLASS_DESC_SIZE) { + if length != Self::HID_DESC_FIXED_SIZE + num_descriptors * Self::HID_CLASS_DESC_SIZE { return Err(anyhow!( "Len doesn't match the given number of descriptors ({num_descriptors})" )); diff --git a/drivers/input/usbhidd/src/main.rs b/drivers/input/usbhidd/src/main.rs index d49f1c1111..dd5a7f2f62 100644 --- a/drivers/input/usbhidd/src/main.rs +++ b/drivers/input/usbhidd/src/main.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Context, Result}; +use anyhow::{Context, Result}; use std::{env, thread, time}; use inputd::ProducerHandle; diff --git a/drivers/pcid/src/main.rs b/drivers/pcid/src/main.rs index 61cd9a787e..1dd8e829bf 100644 --- a/drivers/pcid/src/main.rs +++ b/drivers/pcid/src/main.rs @@ -1,5 +1,4 @@ #![feature(iter_next_chunk)] -#![feature(if_let_guard)] #![feature(non_exhaustive_omitted_patterns_lint)] use std::collections::BTreeMap; diff --git a/drivers/storage/ahcid/src/main.rs b/drivers/storage/ahcid/src/main.rs index bcd66a3a94..0b0c4b72ae 100644 --- a/drivers/storage/ahcid/src/main.rs +++ b/drivers/storage/ahcid/src/main.rs @@ -1,5 +1,3 @@ -// #![cfg_attr(target_arch = "aarch64", feature(stdsimd))] // Required for yield instruction - use std::io::{Read, Write}; use std::os::fd::AsRawFd; use std::usize; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 42f22f6190..d8c73f3941 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-10-03" +channel = "nightly-2026-05-24" components = ["rust-src"]