diff --git a/generic-rt/src/lib.rs b/generic-rt/src/lib.rs index 333c0e8e02..394db7b9f8 100644 --- a/generic-rt/src/lib.rs +++ b/generic-rt/src/lib.rs @@ -92,7 +92,7 @@ impl GenericTcb { Some(&mut *Self::current_ptr()?) } } -pub fn panic_notls(msg: impl core::fmt::Display) -> ! { +pub fn panic_notls(_msg: impl core::fmt::Display) -> ! { //eprintln!("panicked in ld.so: {}", msg); core::intrinsics::abort(); diff --git a/redox-rt/src/arch/x86_64.rs b/redox-rt/src/arch/x86_64.rs index f1e5827ece..cf9d69388a 100644 --- a/redox-rt/src/arch/x86_64.rs +++ b/redox-rt/src/arch/x86_64.rs @@ -12,11 +12,8 @@ use syscall::{ use crate::{ proc::{fork_inner, FdGuard}, - signal::{ - get_sigaltstack, inner_c, PosixStackt, RtSigarea, SigStack, Sigaltstack, - PROC_CONTROL_STRUCT, - }, - RtTcb, Tcb, + signal::{get_sigaltstack, inner_c, PosixStackt, RtSigarea, SigStack, PROC_CONTROL_STRUCT}, + Tcb, }; // Setup a stack starting from the very end of the address space, and then growing downwards. diff --git a/redox-rt/src/lib.rs b/redox-rt/src/lib.rs index 4505a066e1..131a21b01c 100644 --- a/redox-rt/src/lib.rs +++ b/redox-rt/src/lib.rs @@ -1,6 +1,5 @@ #![no_std] #![feature( - asm_const, array_chunks, int_roundings, let_chains, diff --git a/redox-rt/src/signal.rs b/redox-rt/src/signal.rs index a39a96ad72..f303383957 100644 --- a/redox-rt/src/signal.rs +++ b/redox-rt/src/signal.rs @@ -1,17 +1,9 @@ -use core::{ - cell::{Cell, UnsafeCell}, - ffi::{c_int, c_void}, - mem::MaybeUninit, - ptr::NonNull, - sync::atomic::{AtomicU8, AtomicUsize, Ordering}, -}; +use core::{ffi::c_int, mem::MaybeUninit, ptr::NonNull, sync::atomic::Ordering}; use syscall::{ - data::AtomicU64, Error, NonatomicUsize, RawAction, Result, RtSigInfo, SenderInfo, - SetSighandlerData, SigProcControl, Sigcontrol, SigcontrolFlags, TimeSpec, EAGAIN, EINTR, - EINVAL, ENOMEM, EPERM, SIGABRT, SIGBUS, SIGCHLD, SIGCONT, SIGFPE, SIGILL, SIGKILL, SIGQUIT, - SIGSEGV, SIGSTOP, SIGSYS, SIGTRAP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, SIGWINCH, SIGXCPU, - SIGXFSZ, + data::AtomicU64, Error, RawAction, Result, RtSigInfo, SenderInfo, SetSighandlerData, + SigProcControl, Sigcontrol, SigcontrolFlags, TimeSpec, EAGAIN, EINTR, EINVAL, ENOMEM, EPERM, + SIGCHLD, SIGKILL, SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, SIGWINCH, }; use crate::{arch::*, proc::FdGuard, sync::Mutex, RtTcb, Tcb}; diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs index 59c68e4db0..590b65af3a 100644 --- a/src/crt0/src/lib.rs +++ b/src/crt0/src/lib.rs @@ -73,7 +73,7 @@ _start: #[linkage = "weak"] #[no_mangle] -extern "C" fn relibc_panic(pi: &::core::panic::PanicInfo) -> ! { +extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! { loop {} } diff --git a/src/crti/src/lib.rs b/src/crti/src/lib.rs index 32ead0b3fc..489d14547b 100644 --- a/src/crti/src/lib.rs +++ b/src/crti/src/lib.rs @@ -76,7 +76,7 @@ global_asm!( #[linkage = "weak"] #[no_mangle] -extern "C" fn relibc_panic(pi: &::core::panic::PanicInfo) -> ! { +extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! { loop {} } diff --git a/src/crtn/src/lib.rs b/src/crtn/src/lib.rs index 696e60df60..ccde07b534 100644 --- a/src/crtn/src/lib.rs +++ b/src/crtn/src/lib.rs @@ -62,7 +62,7 @@ global_asm!( #[linkage = "weak"] #[no_mangle] -extern "C" fn relibc_panic(pi: &::core::panic::PanicInfo) -> ! { +extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! { loop {} } diff --git a/src/platform/redox/exec.rs b/src/platform/redox/exec.rs index 30c235e8d6..77f6c99874 100644 --- a/src/platform/redox/exec.rs +++ b/src/platform/redox/exec.rs @@ -1,4 +1,7 @@ -use core::num::{NonZeroU64, NonZeroUsize}; +use core::{ + convert::Infallible, + num::{NonZeroU64, NonZeroUsize}, +}; use crate::{ c_str::{CStr, CString}, @@ -23,7 +26,7 @@ fn fexec_impl( total_args_envs_size: usize, extrainfo: &ExtraInfo, interp_override: Option, -) -> Result { +) -> Result { let memory = FdGuard::new(syscall::open("/scheme/memory", 0)?); let addrspace_selection_fd = match redox_rt::proc::fexec_impl( @@ -91,7 +94,7 @@ pub fn execve( exec: Executable<'_>, arg_env: ArgEnv, interp_override: Option, -) -> Result { +) -> Result { // NOTE: We must omit O_CLOEXEC and close manually, otherwise it will be closed before we // have even read it! let (mut image_file, arg0) = match exec {