diff --git a/src/builtins/abbr.rs b/src/builtins/abbr.rs index 7951b6442..2fdf86c1d 100644 --- a/src/builtins/abbr.rs +++ b/src/builtins/abbr.rs @@ -2,8 +2,6 @@ use crate::abbrs::{self, Abbreviation, Position}; use crate::common::{escape, escape_string, valid_func_name, EscapeStringStyle}; use crate::env::{EnvMode, EnvStackSetResult}; -use crate::io::IoStreams; -use crate::parser::Parser; use crate::re::{regex_make_anchored, to_boxed_chars}; use pcre2::utf32::{Regex, RegexBuilder}; diff --git a/src/builtins/builtin.rs b/src/builtins/builtin.rs index 722426b2c..7dfe55223 100644 --- a/src/builtins/builtin.rs +++ b/src/builtins/builtin.rs @@ -1,5 +1,4 @@ use super::prelude::*; -use crate::builtins::shared::{builtin_exists, builtin_get_names}; #[derive(Default)] struct builtin_cmd_opts_t { diff --git a/src/builtins/cd.rs b/src/builtins/cd.rs index 059320816..0cd759886 100644 --- a/src/builtins/cd.rs +++ b/src/builtins/cd.rs @@ -7,7 +7,7 @@ path::path_apply_cdpath, wutil::{normalize_path, wperror, wreadlink}, }; -use errno::{self, Errno}; +use errno::Errno; use libc::{fchdir, EACCES, ELOOP, ENOENT, ENOTDIR, EPERM}; use nix::{fcntl::OFlag, sys::stat::Mode}; use std::{os::fd::AsRawFd, sync::Arc}; diff --git a/src/builtins/commandline.rs b/src/builtins/commandline.rs index c96b3d2e7..df098c8f4 100644 --- a/src/builtins/commandline.rs +++ b/src/builtins/commandline.rs @@ -18,7 +18,6 @@ use crate::tokenizer::{TokenType, Tokenizer}; use crate::wchar::prelude::*; use crate::wcstringutil::join_strings; -use crate::wgetopt::{wgetopter_t, wopt, woption, woption_argument_t}; use std::ops::Range; /// Which part of the comandbuffer are we operating on. diff --git a/src/builtins/disown.rs b/src/builtins/disown.rs index 3aa2a9d68..2e0a9a1dc 100644 --- a/src/builtins/disown.rs +++ b/src/builtins/disown.rs @@ -10,7 +10,7 @@ wutil::{fish_wcstoi, wgettext_fmt}, }; use libc::c_int; -use libc::{self, SIGCONT}; +use libc::SIGCONT; /// Helper for builtin_disown. fn disown_job(cmd: &wstr, streams: &mut IoStreams, j: &Job) { diff --git a/src/builtins/function.rs b/src/builtins/function.rs index 77ce85d78..885fb8b29 100644 --- a/src/builtins/function.rs +++ b/src/builtins/function.rs @@ -6,10 +6,8 @@ use crate::event::{self, EventDescription, EventHandler}; use crate::function; use crate::global_safety::RelaxedAtomicBool; -use crate::io::IoStreams; use crate::nix::getpid; use crate::parse_tree::NodeRef; -use crate::parser::Parser; use crate::parser_keywords::parser_keywords_is_reserved; use crate::signal::Signal; use std::sync::Arc; diff --git a/src/builtins/functions.rs b/src/builtins/functions.rs index e315945a7..543359a7f 100644 --- a/src/builtins/functions.rs +++ b/src/builtins/functions.rs @@ -8,7 +8,6 @@ use crate::function; use crate::highlight::colorize; use crate::highlight::highlight_shell; -use crate::parser::Parser; use crate::parser_keywords::parser_keywords_is_reserved; use crate::termsize::termsize_last; diff --git a/src/builtins/jobs.rs b/src/builtins/jobs.rs index 5c99025ca..fcef1b79d 100644 --- a/src/builtins/jobs.rs +++ b/src/builtins/jobs.rs @@ -18,7 +18,6 @@ wutil::{fish_wcstoi, wgettext_fmt}, }; use libc::c_int; -use libc::{self}; use printf_compat::sprintf; use std::num::NonZeroU32; use std::sync::atomic::Ordering; diff --git a/src/builtins/path.rs b/src/builtins/path.rs index f36182ccd..f87a9213d 100644 --- a/src/builtins/path.rs +++ b/src/builtins/path.rs @@ -16,8 +16,6 @@ use bitflags::bitflags; use libc::{mode_t, F_OK, PATH_MAX, R_OK, S_ISGID, S_ISUID, W_OK, X_OK}; -use super::shared::BuiltinCmd; - macro_rules! path_error { ( $streams:expr, diff --git a/src/builtins/realpath.rs b/src/builtins/realpath.rs index 5605ae9fc..69257de62 100644 --- a/src/builtins/realpath.rs +++ b/src/builtins/realpath.rs @@ -4,7 +4,6 @@ use super::prelude::*; use crate::env::Environment; -use crate::io::IoStreams; use crate::{ path::path_apply_working_directory, wutil::{normalize_path, wrealpath}, diff --git a/src/builtins/set.rs b/src/builtins/set.rs index 0e48daf7d..c747972fb 100644 --- a/src/builtins/set.rs +++ b/src/builtins/set.rs @@ -15,7 +15,6 @@ use crate::expand::expand_escape_variable; use crate::history::history_session_id; use crate::history::History; -use crate::wchar_ext::WExt; use crate::{ env::{EnvMode, EnvVar, Environment}, wutil::wcstoi::wcstoi_partial, diff --git a/src/builtins/shared.rs b/src/builtins/shared.rs index 348441f16..a265d2438 100644 --- a/src/builtins/shared.rs +++ b/src/builtins/shared.rs @@ -7,12 +7,10 @@ use crate::parser::{Block, BlockType, LoopStatus}; use crate::proc::{no_exec, ProcStatus}; use crate::reader::reader_read; -use crate::wchar::{wstr, WString, L}; -use crate::wgetopt::{wgetopter_t, wopt, woption, woption_argument_t}; +use crate::wchar::L; use errno::errno; -use libc::{c_int, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO}; +use libc::{STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO}; -use std::borrow::Cow; use std::fs::File; use std::io::{BufRead, BufReader, Read}; use std::os::fd::FromRawFd; diff --git a/src/builtins/source.rs b/src/builtins/source.rs index 8f37674ec..f521e21d8 100644 --- a/src/builtins/source.rs +++ b/src/builtins/source.rs @@ -7,7 +7,7 @@ parser::Block, reader::reader_read, }; -use libc::{c_int, S_IFMT, S_IFREG}; +use libc::{S_IFMT, S_IFREG}; use nix::{fcntl::OFlag, sys::stat::Mode}; use super::prelude::*; diff --git a/src/builtins/string/pad.rs b/src/builtins/string/pad.rs index a7283043d..35a04a056 100644 --- a/src/builtins/string/pad.rs +++ b/src/builtins/string/pad.rs @@ -1,8 +1,5 @@ -use std::borrow::Cow; - use super::*; use crate::fallback::fish_wcwidth; -use crate::wutil::fish_wcstol; pub struct Pad { char_to_pad: char, diff --git a/src/builtins/string/repeat.rs b/src/builtins/string/repeat.rs index 735834601..64698e1bf 100644 --- a/src/builtins/string/repeat.rs +++ b/src/builtins/string/repeat.rs @@ -1,5 +1,4 @@ use super::*; -use crate::wutil::fish_wcstol; #[derive(Default)] pub struct Repeat { diff --git a/src/builtins/string/replace.rs b/src/builtins/string/replace.rs index 175bdb1cd..9694a595d 100644 --- a/src/builtins/string/replace.rs +++ b/src/builtins/string/replace.rs @@ -1,5 +1,4 @@ use pcre2::utf32::{Regex, RegexBuilder}; -use std::borrow::Cow; use super::*; use crate::future_feature_flags::{feature_test, FeatureFlag}; diff --git a/src/builtins/string/shorten.rs b/src/builtins/string/shorten.rs index c6f130a7a..0b7bf7873 100644 --- a/src/builtins/string/shorten.rs +++ b/src/builtins/string/shorten.rs @@ -1,7 +1,6 @@ use super::*; use crate::common::get_ellipsis_str; use crate::wcstringutil::split_string; -use crate::wutil::fish_wcstol; pub struct Shorten<'args> { ellipsis: &'args wstr, diff --git a/src/builtins/string/split.rs b/src/builtins/string/split.rs index 99fe5c831..01501c447 100644 --- a/src/builtins/string/split.rs +++ b/src/builtins/string/split.rs @@ -2,7 +2,6 @@ use super::*; use crate::wcstringutil::split_about; -use crate::wutil::{fish_wcstoi, fish_wcstol}; pub struct Split<'args> { quiet: bool, diff --git a/src/builtins/string/sub.rs b/src/builtins/string/sub.rs index ad6defa2e..ce41b8f95 100644 --- a/src/builtins/string/sub.rs +++ b/src/builtins/string/sub.rs @@ -1,7 +1,6 @@ use std::num::NonZeroI64; use super::*; -use crate::wutil::fish_wcstol; #[derive(Default)] pub struct Sub { diff --git a/src/builtins/type.rs b/src/builtins/type.rs index 928c8eb17..7552ba6aa 100644 --- a/src/builtins/type.rs +++ b/src/builtins/type.rs @@ -1,5 +1,4 @@ use super::prelude::*; -use crate::builtins::shared::builtin_exists; use crate::common::str2wcstring; use crate::function; use crate::highlight::{colorize, highlight_shell}; diff --git a/src/env_universal_common.rs b/src/env_universal_common.rs index 45762420d..6777bd64b 100644 --- a/src/env_universal_common.rs +++ b/src/env_universal_common.rs @@ -12,7 +12,6 @@ use crate::path::path_get_config; use crate::path::{path_get_config_remoteness, DirRemoteness}; use crate::wchar::prelude::*; -use crate::wchar::{wstr, WString}; use crate::wcstringutil::{join_strings, split_string, string_suffixes_string, LineIterator}; use crate::wutil::{ file_id_for_fd, file_id_for_path, file_id_for_path_narrow, wdirname, wrealpath, wrename, wstat, diff --git a/src/fd_monitor.rs b/src/fd_monitor.rs index 314a63665..2bfac02d2 100644 --- a/src/fd_monitor.rs +++ b/src/fd_monitor.rs @@ -10,7 +10,7 @@ use crate::threads::assert_is_background_thread; use crate::wutil::perror; use errno::errno; -use libc::{self, c_void, EAGAIN, EINTR, EWOULDBLOCK}; +use libc::{c_void, EAGAIN, EINTR, EWOULDBLOCK}; #[cfg(not(HAVE_EVENTFD))] use crate::fds::{make_autoclose_pipes, make_fd_nonblocking}; diff --git a/src/fork_exec/spawn.rs b/src/fork_exec/spawn.rs index 546a0b81a..fd4e931a5 100644 --- a/src/fork_exec/spawn.rs +++ b/src/fork_exec/spawn.rs @@ -5,8 +5,8 @@ use crate::redirection::Dup2List; use crate::signal::get_signals_with_handlers; use crate::{exec::is_thompson_shell_script, libc::_PATH_BSHELL}; -use errno::{self, Errno}; -use libc::{self, c_char, posix_spawn_file_actions_t, posix_spawnattr_t}; +use errno::Errno; +use libc::{c_char, posix_spawn_file_actions_t, posix_spawnattr_t}; use std::ffi::{CStr, CString}; use std::sync::atomic::Ordering; diff --git a/src/function.rs b/src/function.rs index c493d1057..8c9ba2696 100644 --- a/src/function.rs +++ b/src/function.rs @@ -13,7 +13,7 @@ use crate::parser::Parser; use crate::parser_keywords::parser_keywords_is_reserved; use crate::wchar::prelude::*; -use crate::wutil::{dir_iter::DirIter, gettext::wgettext_str, sprintf}; +use crate::wutil::{dir_iter::DirIter, sprintf}; use once_cell::sync::Lazy; use std::collections::{HashMap, HashSet}; use std::sync::{Arc, Mutex}; diff --git a/src/history.rs b/src/history.rs index 65699332c..e21de7dfe 100644 --- a/src/history.rs +++ b/src/history.rs @@ -59,7 +59,6 @@ threads::{assert_is_background_thread, iothread_perform}, util::find_subslice, wchar::prelude::*, - wchar_ext::WExt, wcstringutil::subsequence_in_string, wildcard::{wildcard_match, ANY_STRING}, wutil::{ diff --git a/src/wildcard.rs b/src/wildcard.rs index be4db457c..f814ba973 100644 --- a/src/wildcard.rs +++ b/src/wildcard.rs @@ -447,10 +447,8 @@ mod expander { use crate::{ common::scoped_push, - complete::CompleteFlags, path::append_path_component, - wcstringutil::string_fuzzy_match_string, - wutil::{dir_iter::DirIter, normalize_path, waccess, FileId}, + wutil::{dir_iter::DirIter, normalize_path, FileId}, }; use super::*; diff --git a/src/wutil/wcstoi.rs b/src/wutil/wcstoi.rs index c257c0027..15daf2594 100644 --- a/src/wutil/wcstoi.rs +++ b/src/wutil/wcstoi.rs @@ -3,7 +3,6 @@ use num_traits::{NumCast, PrimInt}; use std::default::Default; use std::iter::{Fuse, Peekable}; -use std::result::Result; struct ParseResult { result: u64,