From 7d1582a555cfea63479f8919aca5c269d72e5d09 Mon Sep 17 00:00:00 2001 From: auronandace Date: Tue, 10 Feb 2026 15:55:32 +0000 Subject: [PATCH] add unused_imports lint --- Cargo.toml | 1 + src/c_str.rs | 7 ++----- src/cxa.rs | 4 ++-- src/header/ifaddrs/mod.rs | 2 -- src/header/locale/data.rs | 7 +------ src/header/malloc/mod.rs | 2 +- src/header/monetary/mod.rs | 4 ++-- src/header/monetary/strfmon.rs | 4 ++-- src/header/netdb/host.rs | 1 - src/header/netdb/linux.rs | 1 - src/header/netdb/mod.rs | 11 ++--------- src/header/signal/linux.rs | 2 +- src/header/signal/mod.rs | 1 - src/header/stdio/getdelim.rs | 10 ++++------ src/header/sys_ptrace/mod.rs | 1 - src/header/sys_time/mod.rs | 2 +- src/header/time/mod.rs | 10 ++++------ src/header/time/strftime.rs | 2 +- src/header/wchar/lookaheadreader.rs | 2 +- src/header/wchar/wprintf.rs | 2 +- src/lib.rs | 2 +- src/platform/allocator/sys.rs | 4 ++-- src/platform/linux/mod.rs | 9 ++++----- src/platform/linux/signal.rs | 2 +- src/platform/logger.rs | 10 +--------- src/platform/pal/epoll.rs | 4 ++-- src/platform/types.rs | 2 +- src/pthread/mod.rs | 3 +-- src/sync/cond.rs | 2 +- src/sync/pthread_mutex.rs | 3 +-- src/sync/rwlock.rs | 1 - src/sync/waitval.rs | 2 -- 32 files changed, 41 insertions(+), 79 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 45b90361d9..2ed76957e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,7 @@ non_snake_case = "allow" non_upper_case_globals = "allow" unpredictable_function_pointer_comparisons = "deny" unsafe_op_in_unsafe_fn = "deny" +unused_imports = "deny" unused_mut = "deny" unused_unsafe = "deny" unused_variables = "allow" # TODO review occurrences (too many for now) diff --git a/src/c_str.rs b/src/c_str.rs index 62a7d29d44..99fb1fab4f 100644 --- a/src/c_str.rs +++ b/src/c_str.rs @@ -2,12 +2,9 @@ use core::{marker::PhantomData, ptr::NonNull, str::Utf8Error}; -use alloc::{ - borrow::{Cow, ToOwned}, - string::String, -}; +use alloc::{borrow::Cow, string::String}; -use crate::platform::types::{c_char, c_int, wchar_t}; +use crate::platform::types::{c_char, wchar_t}; mod private { pub trait Sealed {} diff --git a/src/cxa.rs b/src/cxa.rs index 417a05faa3..443f92b6d4 100644 --- a/src/cxa.rs +++ b/src/cxa.rs @@ -1,6 +1,6 @@ -use crate::platform::types::*; +use crate::platform::types::{c_int, c_void}; use alloc::vec::Vec; -use core::{cell::RefCell, ptr}; +use core::cell::RefCell; use spin::Mutex; #[derive(Clone, Copy)] diff --git a/src/header/ifaddrs/mod.rs b/src/header/ifaddrs/mod.rs index 6ff5aa4bf9..bddb69b858 100644 --- a/src/header/ifaddrs/mod.rs +++ b/src/header/ifaddrs/mod.rs @@ -2,8 +2,6 @@ //! //! Non-POSIX, see . -use core::ptr; - use crate::{ header::{errno, stdlib, sys_socket::sockaddr}, platform::{ diff --git a/src/header/locale/data.rs b/src/header/locale/data.rs index aef2df910d..4968fa10fe 100644 --- a/src/header/locale/data.rs +++ b/src/header/locale/data.rs @@ -1,11 +1,6 @@ use core::str::FromStr; -use alloc::{ - boxed::Box, - ffi::CString, - string::{String, ToString}, - vec::Vec, -}; +use alloc::{boxed::Box, ffi::CString, string::String, vec::Vec}; use super::constants::*; use crate::platform::types::{c_char, c_int}; diff --git a/src/header/malloc/mod.rs b/src/header/malloc/mod.rs index cc8ef5449b..2b73052b42 100644 --- a/src/header/malloc/mod.rs +++ b/src/header/malloc/mod.rs @@ -5,7 +5,7 @@ use crate::{ header::errno::ENOMEM, platform::{ - self, ERRNO, Pal, Sys, + self, Pal, Sys, types::{c_void, size_t}, }, }; diff --git a/src/header/monetary/mod.rs b/src/header/monetary/mod.rs index 1b1ca420cb..c809fd2033 100644 --- a/src/header/monetary/mod.rs +++ b/src/header/monetary/mod.rs @@ -6,9 +6,9 @@ // according to the current locale (TODO). use alloc::string::{String, ToString}; -use core::{ffi::CStr, ptr, slice, str}; +use core::str; -use libm::{fabs, floor, pow, round, trunc}; +use libm::{fabs, pow, round, trunc}; extern crate alloc; diff --git a/src/header/monetary/strfmon.rs b/src/header/monetary/strfmon.rs index c1d3eb9339..70d7117a3c 100644 --- a/src/header/monetary/strfmon.rs +++ b/src/header/monetary/strfmon.rs @@ -2,8 +2,8 @@ use crate::platform::types::c_char; use super::{DEFAULT_MONETARY, FormatFlags, LocaleMonetaryInfo, apply_grouping}; use alloc::string::{String, ToString}; -use core::{ffi::CStr, ptr, result, slice, str}; -use libm::{fabs, floor, pow, round, trunc}; +use core::{ffi::CStr, slice}; +use libm::{fabs, pow, round, trunc}; /// See . /// diff --git a/src/header/netdb/host.rs b/src/header/netdb/host.rs index 5eaed15fcd..59ad6190a1 100644 --- a/src/header/netdb/host.rs +++ b/src/header/netdb/host.rs @@ -2,7 +2,6 @@ use alloc::{boxed::Box, str::SplitWhitespace, vec::Vec}; use core::{mem, ptr}; use crate::{ - c_str::CString, error::ResultExt, header::{ arpa_inet::inet_aton, fcntl::O_RDONLY, netinet_in::in_addr, sys_socket::constants::AF_INET, diff --git a/src/header/netdb/linux.rs b/src/header/netdb/linux.rs index f3f8b80ac1..2601051164 100644 --- a/src/header/netdb/linux.rs +++ b/src/header/netdb/linux.rs @@ -1,5 +1,4 @@ use crate::{ - c_str::CString, error::Errno, fs::File, header::{errno, fcntl}, diff --git a/src/header/netdb/mod.rs b/src/header/netdb/mod.rs index 546c65fcac..8629270e42 100644 --- a/src/header/netdb/mod.rs +++ b/src/header/netdb/mod.rs @@ -4,16 +4,9 @@ mod dns; -use core::{ - cell::Cell, - fmt::Write, - mem, - net::Ipv4Addr, - ptr, slice, - str::{self, FromStr}, -}; +use core::{cell::Cell, fmt::Write, mem, net::Ipv4Addr, ptr, str}; -use alloc::{borrow::ToOwned, boxed::Box, str::SplitWhitespace, string::ToString, vec::Vec}; +use alloc::{boxed::Box, str::SplitWhitespace, string::ToString, vec::Vec}; use crate::{ c_str::{CStr, CString}, diff --git a/src/header/signal/linux.rs b/src/header/signal/linux.rs index 960d53e2f6..0f9d3e314e 100644 --- a/src/header/signal/linux.rs +++ b/src/header/signal/linux.rs @@ -1,4 +1,4 @@ -use super::{siginfo_t, sigset_t, stack_t}; +use super::{sigset_t, stack_t}; use crate::platform::types::c_ulong; use core::arch::global_asm; diff --git a/src/header/signal/mod.rs b/src/header/signal/mod.rs index 18c6d6a24e..0f79e439af 100644 --- a/src/header/signal/mod.rs +++ b/src/header/signal/mod.rs @@ -7,7 +7,6 @@ use core::{arch::global_asm, mem, ptr}; use cbitset::BitSet; use crate::{ - c_str::CStr, error::{Errno, ResultExt}, header::{errno, setjmp, time::timespec}, platform::{ diff --git a/src/header/stdio/getdelim.rs b/src/header/stdio/getdelim.rs index 2358c558f3..5c437c50fe 100644 --- a/src/header/stdio/getdelim.rs +++ b/src/header/stdio/getdelim.rs @@ -1,22 +1,20 @@ // https://pubs.opengroup.org/onlinepubs/9699919799/functions/getline.html -use alloc::{string::String, vec::Vec}; -use core::{fmt::Write, intrinsics::unlikely, ops::Deref, ptr}; +use alloc::vec::Vec; +use core::{intrinsics::unlikely, ptr}; use crate::{ header::{ - errno::{EINVAL, ENOMEM, ENOSPC, EOVERFLOW}, - stdio, + errno::{EINVAL, ENOMEM, EOVERFLOW}, stdio::FILE, stdlib, }, io::BufRead, - platform, platform::types::{c_char, c_int, c_void, size_t, ssize_t}, }; use crate::{ - header::stdio::{F_EOF, F_ERR, default_stdout, feof, ferror}, + header::stdio::{F_EOF, F_ERR, feof, ferror}, platform::ERRNO, }; diff --git a/src/header/sys_ptrace/mod.rs b/src/header/sys_ptrace/mod.rs index a8ca37ca38..30f3484f3b 100644 --- a/src/header/sys_ptrace/mod.rs +++ b/src/header/sys_ptrace/mod.rs @@ -6,7 +6,6 @@ use crate::{ error::ResultExt, platform::{PalPtrace, Sys, types::c_int}, }; -use core::ffi::VaList; pub const PTRACE_TRACEME: c_int = 0; pub const PTRACE_PEEKTEXT: c_int = 1; diff --git a/src/header/sys_time/mod.rs b/src/header/sys_time/mod.rs index c2c5e204e6..6b9a36c64b 100644 --- a/src/header/sys_time/mod.rs +++ b/src/header/sys_time/mod.rs @@ -9,7 +9,7 @@ use crate::{ out::Out, platform::{ Pal, PalSignal, Sys, - types::{c_char, c_int, c_long, suseconds_t, time_t}, + types::{c_char, c_int, c_long}, }, }; use core::ptr::null; diff --git a/src/header/time/mod.rs b/src/header/time/mod.rs index cc73c0da36..266752065a 100644 --- a/src/header/time/mod.rs +++ b/src/header/time/mod.rs @@ -7,7 +7,6 @@ use crate::{ error::{Errno, ResultExt}, header::{ errno::{EFAULT, ENOMEM, EOVERFLOW, ETIMEDOUT}, - fcntl::O_RDONLY, signal::sigevent, stdlib::getenv, unistd::readlink, @@ -16,16 +15,15 @@ use crate::{ platform::{ self, Pal, Sys, types::{ - c_char, c_double, c_int, c_long, c_ulong, clock_t, clockid_t, pid_t, pthread_t, size_t, - time_t, timer_t, + c_char, c_double, c_int, c_long, clock_t, clockid_t, pid_t, size_t, time_t, timer_t, }, }, sync::{Mutex, MutexGuard}, }; use alloc::collections::BTreeSet; use chrono::{ - DateTime, Datelike, FixedOffset, NaiveDate, NaiveDateTime, Offset, ParseError, TimeZone, - Timelike, Utc, format::ParseErrorKind, offset::MappedLocalTime, + DateTime, Datelike, FixedOffset, NaiveDate, NaiveDateTime, Offset, TimeZone, Timelike, Utc, + offset::MappedLocalTime, }; use chrono_tz::{OffsetComponents, OffsetName, Tz}; use core::{cell::OnceCell, convert::TryFrom, fmt::Debug, mem, ptr}; @@ -127,7 +125,7 @@ pub(crate) struct timer_internal_t { pub timerfd: usize, pub eventfd: usize, pub evp: sigevent, - pub thread: pthread_t, + pub thread: platform::types::pthread_t, pub caller_thread: crate::pthread::OsTid, // relibc handles it_interval, not the kernel pub next_wake_time: itimerspec, diff --git a/src/header/time/strftime.rs b/src/header/time/strftime.rs index 05ed15ae90..944f4cb12b 100644 --- a/src/header/time/strftime.rs +++ b/src/header/time/strftime.rs @@ -4,7 +4,7 @@ use alloc::string::String; -use super::{get_offset, tm}; +use super::tm; use crate::{ c_str::CStr, platform::{ diff --git a/src/header/wchar/lookaheadreader.rs b/src/header/wchar/lookaheadreader.rs index a673abe417..f3eae9f973 100644 --- a/src/header/wchar/lookaheadreader.rs +++ b/src/header/wchar/lookaheadreader.rs @@ -2,7 +2,7 @@ use super::{FILE, SEEK_SET, fseek_locked, ftell_locked}; use crate::{ header::{ errno::EILSEQ, - wchar::{MB_CUR_MAX, fgetwc, get_char_encoded_length, mbrtowc}, + wchar::{MB_CUR_MAX, get_char_encoded_length, mbrtowc}, wctype::WEOF, }, io::Read, diff --git a/src/header/wchar/wprintf.rs b/src/header/wchar/wprintf.rs index 067278994a..6a951a8dae 100644 --- a/src/header/wchar/wprintf.rs +++ b/src/header/wchar/wprintf.rs @@ -3,7 +3,7 @@ use crate::{ c_str::{self, WStr}, header::stdio::printf::inner_printf, io::Write, - platform::{self, types::c_int}, + platform::types::c_int, }; use core::ffi::VaList; diff --git a/src/lib.rs b/src/lib.rs index 64651fe964..91a907de79 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -58,7 +58,7 @@ pub mod raw_cell; pub mod start; pub mod sync; -use crate::platform::{Allocator, NEWALLOCATOR, Pal, Sys}; +use crate::platform::{Allocator, NEWALLOCATOR}; #[global_allocator] static ALLOCATOR: Allocator = NEWALLOCATOR; diff --git a/src/platform/allocator/sys.rs b/src/platform/allocator/sys.rs index 1bb446e9bb..fc7bb572b3 100644 --- a/src/platform/allocator/sys.rs +++ b/src/platform/allocator/sys.rs @@ -1,9 +1,9 @@ use crate::{ header::{ - sys_mman::{self, MAP_FAILED, MREMAP_MAYMOVE}, + sys_mman::{self, MREMAP_MAYMOVE}, unistd::pthread_atfork, }, - platform::{Pal, Sys, types::*}, + platform::{Pal, Sys}, sync::Mutex, }; use core::ptr; diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs index 06a88f1418..bfb9b8229e 100644 --- a/src/platform/linux/mod.rs +++ b/src/platform/linux/mod.rs @@ -1,12 +1,12 @@ use core::{arch::asm, num::NonZeroU64, ptr}; -use super::{ERRNO, Pal, types::*}; +use super::{Pal, types::*}; use crate::{ c_str::CStr, header::{ dirent::dirent, - errno::{EINVAL, EIO, EOPNOTSUPP}, - fcntl::{AT_EMPTY_PATH, AT_FDCWD, AT_REMOVEDIR, AT_SYMLINK_NOFOLLOW}, + errno::{EINVAL, EIO}, + fcntl::{AT_EMPTY_PATH, AT_FDCWD, AT_REMOVEDIR}, signal::{SIGCHLD, sigevent}, sys_resource::{rlimit, rusage}, sys_select::timeval, @@ -16,7 +16,6 @@ use crate::{ time::itimerspec, unistd::{SEEK_CUR, SEEK_SET}, }, - io::Write, ld_so::tcb::OsSpecific, out::Out, }; @@ -480,7 +479,7 @@ impl Pal for Sys { path.as_ptr(), owner as u32, group as u32, - AT_SYMLINK_NOFOLLOW + crate::header::fcntl::AT_SYMLINK_NOFOLLOW ) }) .map(|_| ()) diff --git a/src/platform/linux/signal.rs b/src/platform/linux/signal.rs index ced779f512..71d78e5614 100644 --- a/src/platform/linux/signal.rs +++ b/src/platform/linux/signal.rs @@ -8,7 +8,7 @@ use super::{ use crate::{ error::{Errno, Result}, header::{ - signal::{NSIG, SA_RESTORER, SI_QUEUE, sigaction, siginfo_t, sigset_t, stack_t}, + signal::{SA_RESTORER, SI_QUEUE, sigaction, siginfo_t, sigset_t, stack_t}, sys_time::itimerval, time::timespec, }, diff --git a/src/platform/logger.rs b/src/platform/logger.rs index 01848b54b1..0e8ac5dc0c 100644 --- a/src/platform/logger.rs +++ b/src/platform/logger.rs @@ -1,12 +1,6 @@ use core::{fmt, str::FromStr}; -use crate::{ - c_str::CStr, - fs::{self, File}, - header::fcntl, - io::{self, BufWriter, prelude::*}, - sync::Mutex, -}; +use crate::{c_str::CStr, io::prelude::*, sync::Mutex}; use alloc::string::String; use log::{Metadata, Record}; @@ -243,8 +237,6 @@ impl RedoxLogger { process_name: Option<&str>, writer: &mut W, ) -> fmt::Result { - use log::Level; - let target = record.module_path().unwrap_or(record.target()); let level = record.level(); let message = record.args(); diff --git a/src/platform/pal/epoll.rs b/src/platform/pal/epoll.rs index eeff047e72..5e2f6b02a0 100644 --- a/src/platform/pal/epoll.rs +++ b/src/platform/pal/epoll.rs @@ -1,7 +1,7 @@ use crate::{ - error::{Errno, Result}, + error::Result, header::{signal::sigset_t, sys_epoll::epoll_event}, - platform::{Pal, types::*}, + platform::{Pal, types::c_int}, }; pub trait PalEpoll: Pal { diff --git a/src/platform/types.rs b/src/platform/types.rs index 9d80f181e4..b7e53dbad1 100644 --- a/src/platform/types.rs +++ b/src/platform/types.rs @@ -80,7 +80,7 @@ pub type clock_t = c_long; pub type clockid_t = c_int; pub type timer_t = *mut c_void; -pub use crate::header::{bits_pthread::*, bits_sched::*}; +pub use crate::header::bits_pthread::*; #[repr(C, align(16))] pub struct max_align_t { diff --git a/src/pthread/mod.rs b/src/pthread/mod.rs index b9e1413b02..cc21330dc3 100644 --- a/src/pthread/mod.rs +++ b/src/pthread/mod.rs @@ -2,8 +2,7 @@ use core::{ cell::UnsafeCell, - mem::MaybeUninit, - ptr::{self, addr_of}, + ptr, sync::atomic::{AtomicBool, AtomicUsize, Ordering}, }; diff --git a/src/sync/cond.rs b/src/sync/cond.rs index 8e132b7ddd..2ed1e7f795 100644 --- a/src/sync/cond.rs +++ b/src/sync/cond.rs @@ -3,7 +3,7 @@ use crate::{ error::Errno, header::{ - errno::{EINVAL, ENOMEM, ETIMEDOUT}, + errno::{EINVAL, ETIMEDOUT}, pthread::*, time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec, timespec_realtime_to_monotonic}, }, diff --git a/src/sync/pthread_mutex.rs b/src/sync/pthread_mutex.rs index 8092945d76..dd6170d79f 100644 --- a/src/sync/pthread_mutex.rs +++ b/src/sync/pthread_mutex.rs @@ -6,10 +6,9 @@ use core::{ use crate::{ error::Errno, header::{errno::*, pthread::*, time::timespec}, - pthread::*, }; -use crate::platform::{Pal, Sys, types::*}; +use crate::platform::{Pal, Sys, types::c_int}; use super::FutexWaitResult; diff --git a/src/sync/rwlock.rs b/src/sync/rwlock.rs index 58c279f26e..4f1c240610 100644 --- a/src/sync/rwlock.rs +++ b/src/sync/rwlock.rs @@ -1,7 +1,6 @@ use core::{ cell::UnsafeCell, fmt, ops, - ptr::NonNull, sync::atomic::{AtomicU32, Ordering}, }; diff --git a/src/sync/waitval.rs b/src/sync/waitval.rs index fbc9db633e..8f2bc866ee 100644 --- a/src/sync/waitval.rs +++ b/src/sync/waitval.rs @@ -4,8 +4,6 @@ use core::{ sync::atomic::{AtomicU32 as AtomicUint, Ordering}, }; -use super::*; - /// An unsafe "one thread to one thread" synchronization primitive. Used for and modeled after /// pthread_join only, at the moment. #[derive(Debug)]