Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use std::env;
use std::fs::File;
use std::io::Write;
use std::io::Write as _;
use std::path::Path;

pub fn main() {
Expand Down
4 changes: 2 additions & 2 deletions fuzz/fuzz_targets/fuzz_cksum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

#![no_main]
use libfuzzer_sys::fuzz_target;
use rand::Rng;
use rand::Rng as _;
use std::env::temp_dir;
use std::ffi::OsString;
use std::fs::{self, File};
use std::io::Write;
use std::io::Write as _;
use std::process::Command;
use uu_cksum::uumain;
use uufuzz::{
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_cut.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use libfuzzer_sys::fuzz_target;
use uu_cut::uumain;

use rand::Rng;
use rand::Rng as _;
use std::ffi::OsString;

use uufuzz::{
Expand Down
4 changes: 2 additions & 2 deletions fuzz/fuzz_targets/fuzz_dirname.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use libfuzzer_sys::fuzz_target;
use uu_dirname::uumain;

use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::Rng as _;
use rand::prelude::IndexedRandom as _;
use std::ffi::OsString;

use uufuzz::CommandResult;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_echo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target;
use uu_echo::uumain;

use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::prelude::IndexedRandom as _;
use std::ffi::OsString;

use uufuzz::CommandResult;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use uu_env::uumain;

use std::ffi::OsString;

use rand::Rng;
use rand::Rng as _;
use uufuzz::{
CommandResult, compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd,
};
Expand Down
4 changes: 2 additions & 2 deletions fuzz/fuzz_targets/fuzz_expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use libfuzzer_sys::fuzz_target;
use uu_expr::uumain;

use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::Rng as _;
use rand::prelude::IndexedRandom as _;
use std::{env, ffi::OsString};

use uufuzz::CommandResult;
Expand Down
8 changes: 4 additions & 4 deletions fuzz/fuzz_targets/fuzz_non_utf8_paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

#![no_main]
use libfuzzer_sys::fuzz_target;
use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::Rng as _;
use rand::prelude::IndexedRandom as _;
use std::collections::HashSet;
use std::env::temp_dir;
use std::ffi::{OsStr, OsString};
use std::fs;
use std::os::unix::ffi::{OsStrExt, OsStringExt};
use std::os::unix::ffi::{OsStrExt as _, OsStringExt as _};
use std::path::{Path, PathBuf};

use uufuzz::{CommandResult, run_gnu_cmd};
Expand Down Expand Up @@ -146,7 +146,7 @@ fn setup_test_files() -> Result<(PathBuf, Vec<PathBuf>), std::io::Error> {

// Try to create the file - this may fail on some filesystems
if let Ok(mut file) = fs::File::create(&file_path) {
use std::io::Write;
use std::io::Write as _;
let _ = writeln!(file, "test content for file {}", i);
test_files.push(file_path);
}
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_printf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use libfuzzer_sys::fuzz_target;
use uu_printf::uumain;

use rand::Rng;
use rand::seq::IndexedRandom;
use rand::seq::IndexedRandom as _;
use std::env;
use std::ffi::OsString;

Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_seq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use libfuzzer_sys::fuzz_target;
use uu_seq::uumain;

use rand::Rng;
use rand::Rng as _;
use std::ffi::OsString;

use uufuzz::CommandResult;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_seq_parse_number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#![no_main]

use libfuzzer_sys::fuzz_target;
use std::str::FromStr;
use std::str::FromStr as _;
use uu_seq::number::PreciseNumber;

fuzz_target!(|data: &[u8]| {
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use libfuzzer_sys::fuzz_target;
use uu_sort::uumain;

use rand::Rng;
use rand::Rng as _;
use std::env;
use std::ffi::OsString;

Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use libfuzzer_sys::fuzz_target;
use uu_split::uumain;

use rand::Rng;
use rand::Rng as _;
use std::ffi::OsString;

use uufuzz::{
Expand Down
4 changes: 2 additions & 2 deletions fuzz/fuzz_targets/fuzz_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use libfuzzer_sys::fuzz_target;
use uu_test::uumain;

use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::Rng as _;
use rand::prelude::IndexedRandom as _;
use std::ffi::OsString;

use uufuzz::CommandResult;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_tr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target;
use std::ffi::OsString;
use uu_tr::uumain;

use rand::Rng;
use rand::Rng as _;

use uufuzz::{
CommandResult, compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd,
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/fuzz_wc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use libfuzzer_sys::fuzz_target;
use uu_wc::uumain;

use rand::Rng;
use rand::Rng as _;
use std::ffi::OsString;

use uufuzz::{
Expand Down
2 changes: 1 addition & 1 deletion fuzz/uufuzz/examples/fuzzing_simulation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.

use rand::Rng;
use rand::Rng as _;
use std::ffi::OsString;
use uufuzz::{generate_and_run_uumain, generate_random_string, run_gnu_cmd};

Expand Down
2 changes: 1 addition & 1 deletion fuzz/uufuzz/examples/integration_testing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use uufuzz::{generate_and_run_uumain, run_gnu_cmd};

// Mock sort implementation for demonstration
fn mock_sort_main(args: std::vec::IntoIter<OsString>) -> i32 {
use std::io::{self, Read};
use std::io::{self, Read as _};

let args: Vec<OsString> = args.collect();
let mut numeric_sort = false;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/uufuzz/examples/pipe_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// file that was distributed with this source code.

use std::ffi::OsString;
use std::io::{self, Read};
use std::io::{self, Read as _};
use uufuzz::{compare_result, generate_and_run_uumain, run_gnu_cmd};

// Mock cat implementation for demonstration
Expand Down
8 changes: 4 additions & 4 deletions fuzz/uufuzz/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ use libc::{STDERR_FILENO, STDOUT_FILENO, close, dup, dup2, pipe};
use pretty_print::{
print_diff, print_end_with_status, print_or_empty, print_section, print_with_style,
};
use rand::Rng;
use rand::prelude::IndexedRandom;
use rand::Rng as _;
use rand::prelude::IndexedRandom as _;
use std::env::temp_dir;
use std::ffi::OsString;
use std::fs::File;
use std::io::{Seek, SeekFrom, Write};
use std::os::fd::{AsRawFd, RawFd};
use std::io::{Seek as _, SeekFrom, Write as _};
use std::os::fd::{AsRawFd as _, RawFd};
use std::process::{Command, Stdio};
use std::sync::atomic::Ordering;
use std::sync::{Once, atomic::AtomicBool};
Expand Down
4 changes: 2 additions & 2 deletions src/uu/arch/src/arch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
// file that was distributed with this source code.

use clap::Command;
use platform_info::{PlatformInfo, PlatformInfoAPI, UNameAPI};
use std::io::{Write, stdout};
use platform_info::{PlatformInfo, PlatformInfoAPI as _, UNameAPI as _};
use std::io::{Write as _, stdout};
use uucore::error::{UResult, USimpleError};
use uucore::translate;

Expand Down
6 changes: 3 additions & 3 deletions src/uu/base32/src/base_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
use clap::{Arg, ArgAction, Command};
use std::ffi::OsString;
use std::fs::File;
use std::io::{self, BufRead, BufReader, Write};
use std::io::{self, BufRead, BufReader, Write as _};
use std::path::{Path, PathBuf};
use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::encoding::{
BASE2LSBF, BASE2MSBF, Base32Wrapper, Base58Wrapper, Base64SimdWrapper, EncodingWrapper, Format,
SupportsFastDecodeAndEncode, Z85Wrapper,
for_base_common::{BASE32, BASE32HEX, BASE64URL, HEXUPPER_PERMISSIVE},
};
use uucore::error::{FromIo, UResult, USimpleError, UUsageError, strip_errno};
use uucore::error::{FromIo as _, UResult, USimpleError, UUsageError, strip_errno};
use uucore::format_usage;
use uucore::translate;

Expand Down
4 changes: 2 additions & 2 deletions src/uu/basename/src/basename.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
use clap::builder::ValueParser;
use clap::{Arg, ArgAction, Command};
use std::ffi::OsString;
use std::io::{Write, stdout};
use std::io::{Write as _, stdout};
use std::path::PathBuf;
use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::error::{UResult, UUsageError};
use uucore::format_usage;
use uucore::line_ending::LineEnding;
Expand Down
6 changes: 3 additions & 3 deletions src/uu/cat/src/cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ use clap::{Arg, ArgAction, Command};
use memchr::memchr2;
use std::ffi::OsString;
use std::fs::{File, metadata};
use std::io::{self, BufWriter, ErrorKind, IsTerminal, Read, Write};
use std::io::{self, BufWriter, ErrorKind, IsTerminal as _, Read, Write};
#[cfg(unix)]
use std::os::fd::AsFd;
#[cfg(unix)]
use std::os::unix::fs::FileTypeExt;
use std::os::unix::fs::FileTypeExt as _;
use thiserror::Error;
use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::error::UResult;
use uucore::translate;
use uucore::{fast_inc::fast_inc_one, format_usage};
Expand Down
2 changes: 1 addition & 1 deletion src/uu/cat/src/platform/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fn is_appending<F: AsFd>(file: &F) -> bool {
mod tests {
use crate::platform::unix::{is_appending, is_unsafe_overwrite};
use std::fs::OpenOptions;
use std::io::{Seek, SeekFrom, Write};
use std::io::{Seek as _, SeekFrom, Write as _};
use tempfile::NamedTempFile;

#[test]
Expand Down
6 changes: 3 additions & 3 deletions src/uu/chgrp/src/chgrp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@

// spell-checker:ignore (ToDO) COMFOLLOW Chowner RFILE RFILE's derefer dgid nonblank nonprint nonprinting

use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::entries;
use uucore::error::{FromIo, UResult, USimpleError};
use uucore::error::{FromIo as _, UResult, USimpleError};
use uucore::format_usage;
use uucore::perms::{GidUidOwnerFilter, IfFrom, chown_base, options};
use uucore::translate;

use clap::{Arg, ArgAction, ArgMatches, Command};

use std::fs;
use std::os::unix::fs::MetadataExt;
use std::os::unix::fs::MetadataExt as _;

fn parse_gid_from_str(group: &str) -> Result<u32, String> {
if let Some(gid_str) = group.strip_prefix(':') {
Expand Down
4 changes: 2 additions & 2 deletions src/uu/chmod/src/chmod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
use clap::{Arg, ArgAction, Command};
use std::ffi::OsString;
use std::fs;
use std::os::unix::fs::{MetadataExt, PermissionsExt};
use std::os::unix::fs::{MetadataExt as _, PermissionsExt as _};
use std::path::{Path, PathBuf};
use thiserror::Error;
use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::error::{ExitCode, UError, UResult, USimpleError, UUsageError, set_exit_code};
use uucore::fs::display_permissions_unix;
use uucore::libc::mode_t;
Expand Down
6 changes: 3 additions & 3 deletions src/uu/chown/src/chown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

// spell-checker:ignore (ToDO) COMFOLLOW Passwd RFILE RFILE's derefer dgid duid groupname

use uucore::display::Quotable;
use uucore::display::Quotable as _;
pub use uucore::entries::{self, Group, Locate, Passwd};
use uucore::format_usage;
use uucore::perms::{GidUidOwnerFilter, IfFrom, chown_base, options};
use uucore::translate;

use uucore::error::{FromIo, UResult, USimpleError};
use uucore::error::{FromIo as _, UResult, USimpleError};

use clap::{Arg, ArgAction, ArgMatches, Command};

use std::fs;
use std::os::unix::fs::MetadataExt;
use std::os::unix::fs::MetadataExt as _;

fn parse_gid_uid_and_filter(matches: &ArgMatches) -> UResult<GidUidOwnerFilter> {
let filter = if let Some(spec) = matches.get_one::<String>(options::FROM) {
Expand Down
6 changes: 3 additions & 3 deletions src/uu/chroot/src/chroot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ use crate::error::ChrootError;
use clap::{Arg, ArgAction, Command};
use std::ffi::CString;
use std::io::{Error, ErrorKind};
use std::os::unix::prelude::OsStrExt;
use std::os::unix::process::CommandExt;
use std::os::unix::prelude::OsStrExt as _;
use std::os::unix::process::CommandExt as _;
use std::path::{Path, PathBuf};
use std::process;
use uucore::entries::{Locate, Passwd, grp2gid, usr2uid};
use uucore::entries::{Locate as _, Passwd, grp2gid, usr2uid};
use uucore::error::{UResult, UUsageError};
use uucore::fs::{MissingHandling, ResolveMode, canonicalize};
use uucore::libc::{self, chroot, setgid, setgroups, setuid};
Expand Down
2 changes: 1 addition & 1 deletion src/uu/chroot/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use std::io::Error;
use std::path::PathBuf;
use thiserror::Error;
use uucore::display::Quotable;
use uucore::display::Quotable as _;
use uucore::error::UError;
use uucore::libc;
use uucore::translate;
Expand Down
4 changes: 2 additions & 2 deletions src/uu/cksum/src/cksum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// spell-checker:ignore (ToDO) fname, algo, bitlen

use std::ffi::OsStr;
use std::io::{Write, stderr};
use std::io::{Write as _, stderr};

use clap::Command;
use uu_checksum_common::{ChecksumCommand, checksum_main, default_checksum_app, options};
use uu_checksum_common::{ChecksumCommand as _, checksum_main, default_checksum_app, options};

use uucore::checksum::compute::OutputFormat;
use uucore::checksum::{
Expand Down
6 changes: 3 additions & 3 deletions src/uu/comm/src/comm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
use std::cmp::Ordering;
use std::ffi::OsString;
use std::fs::{File, metadata};
use std::io::{self, BufRead, BufReader, BufWriter, Read, StdinLock, Write, stdin};
use std::io::{self, BufRead as _, BufReader, BufWriter, Read as _, StdinLock, Write, stdin};
use std::path::Path;
use uucore::display::Quotable;
use uucore::error::{FromIo, UResult, USimpleError};
use uucore::display::Quotable as _;
use uucore::error::{FromIo as _, UResult, USimpleError};
use uucore::format_usage;
use uucore::fs::paths_refer_to_same_file;
use uucore::line_ending::LineEnding;
Expand Down
Loading
Loading