diff --git a/src/header/pty/redox.rs b/src/header/pty/redox.rs index 32527576de..a4fad5c608 100644 --- a/src/header/pty/redox.rs +++ b/src/header/pty/redox.rs @@ -1,8 +1,10 @@ use crate::{ - Pal, Sys, error::ResultExt, header::{fcntl, unistd}, - platform::types::{c_char, c_int, ssize_t}, + platform::{ + Pal, Sys, + types::{c_char, c_int, ssize_t}, + }, }; pub(super) unsafe fn openpty(name: &mut [u8]) -> Result<(c_int, c_int), ()> { diff --git a/src/header/signal/redox.rs b/src/header/signal/redox.rs index 304aa9cecc..781b0923e4 100644 --- a/src/header/signal/redox.rs +++ b/src/header/signal/redox.rs @@ -1,5 +1,3 @@ -use core::arch::global_asm; - use redox_rt::signal::SiginfoAbi; use super::{siginfo_t, sigset_t, stack_t}; diff --git a/src/header/sys_ioctl/redox/mod.rs b/src/header/sys_ioctl/redox/mod.rs index d7924b4108..8b3cf8fc23 100644 --- a/src/header/sys_ioctl/redox/mod.rs +++ b/src/header/sys_ioctl/redox/mod.rs @@ -4,12 +4,9 @@ use syscall; use crate::{ error::{Errno, Result, ResultExt}, - header::{ - errno::{self, EINVAL}, - fcntl, termios, - }, + header::{errno::EINVAL, fcntl, termios}, platform::{ - self, Pal, Sys, + Pal, Sys, types::{c_int, c_ulong, c_ulonglong, c_void, pid_t}, }, }; diff --git a/src/header/sys_syslog/redox.rs b/src/header/sys_syslog/redox.rs index 69539e1b14..c396224e6a 100644 --- a/src/header/sys_syslog/redox.rs +++ b/src/header/sys_syslog/redox.rs @@ -1,9 +1,4 @@ -use crate::{ - error::{Errno, Result}, - fs::File, - header::fcntl, - io::BufWriter, -}; +use crate::{error::Result, fs::File, header::fcntl, io::BufWriter}; use super::logger::LogSink; diff --git a/src/platform/redox/clone.rs b/src/platform/redox/clone.rs index 1af2c2f8a7..cf4e52da82 100644 --- a/src/platform/redox/clone.rs +++ b/src/platform/redox/clone.rs @@ -1,12 +1 @@ -use core::mem::size_of; - -use syscall::{ - SetSighandlerData, - data::Map, - error::Result, - flag::{MapFlags, O_CLOEXEC}, -}; - -use redox_rt::{proc::FdGuard, signal::sighandler_function}; - pub use redox_rt::{proc::*, thread::*}; diff --git a/src/platform/redox/epoll.rs b/src/platform/redox/epoll.rs index f552362648..b73660d697 100644 --- a/src/platform/redox/epoll.rs +++ b/src/platform/redox/epoll.rs @@ -4,11 +4,10 @@ use super::{ }; use crate::{ - error::{Errno, ResultExt}, + error::Errno, fs::File, header::{errno::*, fcntl::*, signal::sigset_t, sys_epoll::*}, io::prelude::*, - platform, }; use core::{mem, slice}; use syscall::{ diff --git a/src/platform/redox/event.rs b/src/platform/redox/event.rs index 0ffcf9757d..900be2d352 100644 --- a/src/platform/redox/event.rs +++ b/src/platform/redox/event.rs @@ -8,7 +8,6 @@ use crate::header::{ use super::libredox::RawResult; -use bitflags::Flags; use syscall::{EINVAL, Error, Result}; #[unsafe(no_mangle)] diff --git a/src/platform/redox/exec.rs b/src/platform/redox/exec.rs index 8c0727fad7..d4b8dcf8e1 100644 --- a/src/platform/redox/exec.rs +++ b/src/platform/redox/exec.rs @@ -8,10 +8,7 @@ use crate::{ fs::File, header::{limits::PATH_MAX, string::strlen}, io::{BufReader, SeekFrom, prelude::*}, - platform::{ - sys::{S_ISGID, S_ISUID}, - types::*, - }, + platform::types::*, }; use redox_rt::{ diff --git a/src/platform/redox/extra.rs b/src/platform/redox/extra.rs index 2939f1a243..1e3138ed44 100644 --- a/src/platform/redox/extra.rs +++ b/src/platform/redox/extra.rs @@ -1,4 +1,4 @@ -use core::{ptr, slice}; +use core::slice; use crate::{ error::{Errno, ResultExt}, diff --git a/src/platform/redox/libcscheme.rs b/src/platform/redox/libcscheme.rs index bd3ce49a81..a089606055 100644 --- a/src/platform/redox/libcscheme.rs +++ b/src/platform/redox/libcscheme.rs @@ -1,7 +1,6 @@ -use super::libredox; use crate::{c_str::CStr, header::stdlib::getenv, platform::types::*}; -use core::{ptr, slice}; -use syscall::{EINVAL, EIO, ENOENT, Error, Result, flag::*}; +use core::ptr; +use syscall::{EIO, ENOENT, Error, Result, flag::*}; pub const LIBC_SCHEME: &'static str = "libc:"; diff --git a/src/platform/redox/libredox.rs b/src/platform/redox/libredox.rs index ceb9cc2feb..61edc5aa6a 100644 --- a/src/platform/redox/libredox.rs +++ b/src/platform/redox/libredox.rs @@ -1,8 +1,4 @@ -use core::{ - cell::LazyCell, - slice, str, - sync::atomic::{AtomicBool, Ordering}, -}; +use core::{slice, str}; use alloc::vec::Vec; use ioslice::IoSlice; @@ -10,15 +6,11 @@ use redox_rt::{ protocol::{ProcKillTarget, SocketCall, WaitFlags}, sys::{WaitpidTarget, posix_read, posix_write}, }; -use syscall::{CallFlags, EMFILE, ENOSYS, Error, Result}; +use syscall::{EMFILE, Error, Result}; use crate::{ header::{ - errno::EINVAL, - signal::{SIG_BLOCK, SIG_SETMASK, SIG_UNBLOCK, sigaction}, - sys_stat::UTIME_NOW, - sys_uio::iovec, - time::timespec, + errno::EINVAL, signal::sigaction, sys_stat::UTIME_NOW, sys_uio::iovec, time::timespec, }, out::Out, platform::{PalSignal, types::*}, diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index 709eeda930..94b300849d 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -1,17 +1,17 @@ use core::{ convert::TryFrom, - mem::{self, MaybeUninit, size_of}, + mem::{self, size_of}, num::NonZeroU64, ptr, slice, str, }; use redox_rt::{ RtTcb, - protocol::{WaitFlags, wifstopped, wstopsig}, + protocol::{WaitFlags, wifstopped}, sys::{Resugid, WaitpidTarget}, }; use syscall::{ - self, EILSEQ, EMFILE, Error, MODE_PERM, PtraceEvent, - data::{Map, Stat as redox_stat, StatVfs as redox_statvfs, TimeSpec as redox_timespec}, + self, EILSEQ, Error, MODE_PERM, + data::{Map, TimeSpec as redox_timespec}, dirent::{DirentHeader, DirentKind}, }; @@ -19,24 +19,23 @@ use self::{ exec::Executable, path::{FileLock, canonicalize, openat2, openat2_path}, }; -use super::{ERRNO, Pal, Read, types::*}; +use super::{Pal, Read, types::*}; use crate::{ c_str::{CStr, CString}, - error::{self, Errno, Result, ResultExt}, + error::{Errno, Result}, fs::File, header::{ - dirent::dirent, errno::{ EBADF, EBADFD, EBADR, EEXIST, EFAULT, EFBIG, EINTR, EINVAL, EIO, ENAMETOOLONG, ENOENT, ENOMEM, ENOSYS, EOPNOTSUPP, EPERM, ERANGE, }, - fcntl::{self, AT_EMPTY_PATH, AT_FDCWD, AT_SYMLINK_NOFOLLOW, O_CREAT, O_RDONLY, O_RDWR}, + fcntl::{self, AT_EMPTY_PATH, AT_FDCWD, AT_SYMLINK_NOFOLLOW}, limits, pthread::{pthread_cancel, pthread_create}, signal::{NSIG, SIGEV_NONE, SIGEV_SIGNAL, SIGEV_THREAD, SIGRTMIN, sigevent}, stdio::RENAME_NOREPLACE, sys_file, - sys_mman::{MAP_ANONYMOUS, MAP_FAILED, PROT_READ, PROT_WRITE}, + sys_mman::{MAP_ANONYMOUS, PROT_READ, PROT_WRITE}, sys_random, sys_resource::{RLIM_INFINITY, rlimit, rusage}, sys_select::timeval, @@ -44,17 +43,13 @@ use crate::{ sys_statvfs::statvfs, sys_time::timezone, sys_utsname::{UTSLENGTH, utsname}, - sys_wait, time::{TIMER_ABSTIME, itimerspec, timer_internal_t, timespec}, unistd::{F_OK, R_OK, SEEK_CUR, SEEK_SET, W_OK, X_OK}, }, io::{self, BufReader, prelude::*}, - ld_so::tcb::{OsSpecific, Tcb}, + ld_so::tcb::OsSpecific, out::Out, - platform::sys::{ - libredox::RawResult, - timer::{timer_routine, timer_update_wake_time}, - }, + platform::sys::timer::{timer_routine, timer_update_wake_time}, sync::rwlock::RwLock, }; diff --git a/src/platform/redox/path.rs b/src/platform/redox/path.rs index e2d1c97424..d59f6b9e4c 100644 --- a/src/platform/redox/path.rs +++ b/src/platform/redox/path.rs @@ -1,9 +1,7 @@ use alloc::{ - borrow::ToOwned, boxed::Box, ffi::CString, string::{String, ToString}, - vec::Vec, }; use core::{ffi::c_int, str}; use redox_rt::signal::tmp_disable_signals; diff --git a/src/platform/redox/signal.rs b/src/platform/redox/signal.rs index 24267a2c2d..2989c9da4f 100644 --- a/src/platform/redox/signal.rs +++ b/src/platform/redox/signal.rs @@ -7,17 +7,15 @@ use crate::{ header::{ errno::{EINVAL, ENOSYS}, signal::{ - NSIG, SA_SIGINFO, SIG_BLOCK, SIG_DFL, SIG_IGN, SIG_SETMASK, SIG_UNBLOCK, SS_DISABLE, - SS_ONSTACK, sigaction, siginfo_t, sigset_t, sigval, stack_t, ucontext_t, + SIG_BLOCK, SIG_DFL, SIG_IGN, SIG_SETMASK, SIG_UNBLOCK, SS_DISABLE, SS_ONSTACK, + sigaction, siginfo_t, sigset_t, sigval, stack_t, ucontext_t, }, sys_time::{ITIMER_REAL, itimerval}, time::timespec, }, - platform::ERRNO, }; -use core::mem::{self, offset_of}; +use core::mem::offset_of; use redox_rt::{ - proc::FdGuard, protocol::ProcKillTarget, signal::{ PosixStackt, SigStack, Sigaction, SigactionFlags, SigactionKind, Sigaltstack, SignalHandler, diff --git a/src/platform/redox/socket.rs b/src/platform/redox/socket.rs index 72ff905ffe..2f5b2231c8 100644 --- a/src/platform/redox/socket.rs +++ b/src/platform/redox/socket.rs @@ -1,4 +1,4 @@ -use alloc::{string::String, vec::Vec}; +use alloc::vec::Vec; use core::{cmp, mem, ptr, slice, str}; use redox_rt::{ proc::FdGuard, @@ -7,17 +7,17 @@ use redox_rt::{ use syscall::{self, flag::*}; use super::{ - super::{ERRNO, Pal, PalSocket, types::*}, + super::{Pal, PalSocket, types::*}, Sys, path::dir_path_and_fd_path, }; use crate::{ - error::{Errno, Result, ResultExt}, + error::{Errno, Result}, header::{ arpa_inet::inet_aton, errno::{ - EAFNOSUPPORT, EDOM, EFAULT, EINVAL, EISCONN, EMSGSIZE, ENOMEM, ENOSYS, ENOTCONN, - ENOTSOCK, EOPNOTSUPP, EPROTONOSUPPORT, + EAFNOSUPPORT, EDOM, EFAULT, EINVAL, EMSGSIZE, ENOMEM, ENOSYS, ENOTCONN, ENOTSOCK, + EOPNOTSUPP, EPROTONOSUPPORT, }, netinet_in::{in_addr, in_port_t, sockaddr_in}, string::strnlen, diff --git a/src/platform/redox/timer.rs b/src/platform/redox/timer.rs index 2dce62bcfb..76fa628ac8 100644 --- a/src/platform/redox/timer.rs +++ b/src/platform/redox/timer.rs @@ -1,23 +1,17 @@ -use ::event::raw::RawEventV1; use syscall::Error; use crate::{ error::{Errno, Result}, header::{ errno::EIO, - signal::{SIGEV_SIGNAL, SIGEV_THREAD, raise, sigevent, sigval}, + signal::{SIGEV_SIGNAL, SIGEV_THREAD}, time::{timer_internal_t, timespec}, }, out::Out, - platform::{ - Pal, Sys, - sys::{event, libredox}, - types::c_void, - }, + platform::{Pal, Sys, sys::event, types::c_void}, }; use core::{ - mem::{MaybeUninit, size_of, transmute}, - ops::ControlFlow, + mem::{MaybeUninit, size_of}, ptr, slice, };