refactor: avoid thiserror::Error imports

Author: xtqqczze

src/uu/cat/src/cat.rs

@@ -17,7 +17,6 @@ use std::io::{self, BufWriter, ErrorKind, IsTerminal, Read, Write};
 use std::os::fd::AsFd;
 #[cfg(unix)]
 use std::os::unix::fs::FileTypeExt;
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::{UResult, strip_errno};
 use uucore::translate;
@@ -79,7 +78,7 @@ impl LineNumber {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 enum CatError {
     /// Wrapper around `io::Error`
     #[error("{}", strip_errno(.0))]

src/uu/chcon/src/errors.rs

@@ -9,13 +9,12 @@ use std::ffi::OsString;
 use std::fmt::Write;
 use std::io;
 
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::translate;
 
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Error, Debug)]
+#[derive(Debug, thiserror::Error)]
 pub(crate) enum Error {
     #[error("{}", translate!("chcon-error-no-context-specified"))]
     MissingContext,

src/uu/chmod/src/chmod.rs

@@ -10,7 +10,6 @@ use std::ffi::OsString;
 use std::fs;
 use std::os::unix::fs::{MetadataExt, PermissionsExt};
 use std::path::{Path, PathBuf};
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::{ExitCode, UError, UResult, USimpleError, UUsageError, set_exit_code};
 use uucore::fs::display_permissions_unix;
@@ -23,7 +22,7 @@ use uucore::{format_usage, show, show_error};
 
 use uucore::translate;
 
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 enum ChmodError {
     #[error("{}", translate!("chmod-error-cannot-stat", "file" => _0.quote()))]
     CannotStat(PathBuf),

src/uu/chroot/src/error.rs

@@ -7,14 +7,13 @@
 use std::ffi::OsString;
 use std::io::Error;
 use std::path::PathBuf;
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::UError;
 use uucore::libc;
 use uucore::translate;
 
 /// Errors that can happen while executing chroot.
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum ChrootError {
     /// Failed to enter the specified directory.
     #[error("{}", translate!("chroot-error-cannot-enter", "dir" => _0.quote(), "err" => _1))]

src/uu/cp/src/cp.rs

@@ -24,7 +24,6 @@ use filetime::FileTime;
 use indicatif::{ProgressBar, ProgressStyle};
 #[cfg(unix)]
 use nix::sys::stat::{Mode, SFlag, dev_t, mknod as nix_mknod, mode_t};
-use thiserror::Error;
 
 use platform::copy_on_write;
 use uucore::display::Quotable;
@@ -50,7 +49,7 @@ use crate::copydir::copy_directory;
 mod copydir;
 mod platform;
 
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum CpError {
     /// Simple [`io::Error`] wrapper
     #[error("{0}")]

src/uu/csplit/src/csplit_error.rs

@@ -4,13 +4,12 @@
 // file that was distributed with this source code.
 
 use std::io;
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::UError;
 use uucore::translate;
 
 /// Errors thrown by the csplit command
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum CsplitError {
     #[error("IO error: {}", _0)]
     IoError(#[from] io::Error),

src/uu/dd/src/parseargs.rs

@@ -9,15 +9,14 @@ mod unit_tests;
 
 use super::{ConversionMode, IConvFlags, IFlags, Num, OConvFlags, OFlags, Settings, StatusLevel};
 use crate::conversion_tables::ConversionTable;
-use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::UError;
 use uucore::parser::parse_size::{ParseSizeError, Parser as SizeParser};
 use uucore::show_warning;
 use uucore::translate;
 
 /// Parser Errors describe errors with parser input
-#[derive(Debug, PartialEq, Eq, Error)]
+#[derive(Debug, PartialEq, Eq, thiserror::Error)]
 pub enum ParseError {
     #[error("{}", translate!("dd-error-unrecognized-operand", "operand" => .0.clone()))]
     UnrecognizedOperand(String),

src/uu/df/src/columns.rs

@@ -5,7 +5,6 @@
 // spell-checker:ignore itotal iused iavail ipcent pcent squashfs
 use crate::{OPT_INODES, OPT_OUTPUT, OPT_PRINT_TYPE};
 use clap::{ArgMatches, parser::ValueSource};
-use thiserror::Error;
 use uucore::display::Quotable;
 
 /// The columns in the output table produced by `df`.
@@ -58,7 +57,7 @@ pub(crate) enum Column {
 }
 
 /// An error while defining which columns to display in the output table.
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 pub(crate) enum ColumnError {
     /// If a column appears more than once in the `--output` argument.
     #[error("{}", .0.quote())]

src/uu/df/src/df.rs

@@ -23,7 +23,6 @@ use clap::{Arg, ArgAction, ArgMatches, Command, parser::ValueSource};
 use std::ffi::OsString;
 use std::io::stdout;
 use std::path::Path;
-use thiserror::Error;
 
 use crate::blocks::{BlockSize, read_block_size};
 use crate::columns::{Column, ColumnError};
@@ -118,7 +117,7 @@ impl Options {
     }
 }
 
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 enum OptionsError {
     // TODO This needs to vary based on whether `--block-size`
     // or `-B` were provided.
@@ -429,7 +428,7 @@ where
     Ok(result)
 }
 
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 enum DfError {
     /// A problem while parsing command-line options.
     #[error("{}", .0)]

src/uu/du/src/du.rs

@@ -20,7 +20,6 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::mpsc;
 use std::thread;
-use thiserror::Error;
 use uucore::display::{Quotable, print_verbatim};
 use uucore::error::{FromIo, UError, UResult, USimpleError, set_exit_code};
 use uucore::fsext::{MetadataTimeField, metadata_get_time};
@@ -737,7 +736,7 @@ fn du_regular(
     Ok(my_stat)
 }
 
-#[derive(Debug, Error)]
+#[derive(Debug, thiserror::Error)]
 enum DuError {
     #[error("{}", translate!("du-error-invalid-max-depth", "depth" => _0.quote()))]
     InvalidMaxDepthArg(String),