refactor: simplify UError construction

Author: xtqqczze

src/uu/base32/src/base_common.rs

@@ -741,7 +741,7 @@ pub mod fast_decode {
             } else if ignore_garbage {
                 continue;
             } else {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
 
             if supports_partial_decode {
@@ -790,7 +790,7 @@ pub mod fast_decode {
             write_to_output(&mut decoded_buffer, output)?;
 
             if had_invalid_tail {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
         }
 
@@ -857,7 +857,7 @@ pub mod fast_decode {
                             buffer.drain(..decode_in_chunks_of_size);
                         }
                     }
-                    return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                    return Err(USimpleError::new(1, "error: invalid input"));
                 }
 
                 if supports_partial_decode {
@@ -909,7 +909,7 @@ pub mod fast_decode {
             write_to_output(&mut decoded_buffer, output)?;
 
             if had_invalid_tail {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
         }
 

src/uu/stdbuf/src/stdbuf.rs

@@ -223,9 +223,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let mut command_values = matches
         .get_many::<OsString>(options::COMMAND)
-        .ok_or_else(|| UUsageError::new(125, "no command specified".to_string()))?;
+        .ok_or_else(|| UUsageError::new(125, "no command specified"))?;
     let Some(first_command) = command_values.next() else {
-        return Err(UUsageError::new(125, "no command specified".to_string()));
+        return Err(UUsageError::new(125, "no command specified"));
     };
     let mut command = process::Command::new(first_command);
     let command_params: Vec<&OsString> = command_values.collect();

src/uu/unexpand/src/unexpand.rs

@@ -283,10 +283,10 @@ fn open(path: &OsString) -> UResult<BufReader<Box<dyn Read + 'static>>> {
     let file_buf;
     let filename = Path::new(path);
     if filename.is_dir() {
-        Err(Box::new(USimpleError {
-            code: 1,
-            message: translate!("unexpand-error-is-directory", "path" => filename.maybe_quote()),
-        }))
+        Err(USimpleError::new(
+            1,
+            translate!("unexpand-error-is-directory", "path" => filename.maybe_quote()),
+        ))
     } else if path == "-" {
         Ok(BufReader::new(Box::new(stdin()) as Box<dyn Read>))
     } else {

src/uucore/src/lib/features/encoding.rs

@@ -88,11 +88,11 @@ impl SupportsFastDecodeAndEncode for Base64SimdWrapper {
                     let segment_len = blocks * 4;
 
                     if segment_len > remaining.len() {
-                        return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                        return Err(USimpleError::new(1, "error: invalid input"));
                     }
 
                     if Self::decode_with_standard(&remaining[..segment_len], output).is_err() {
-                        return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                        return Err(USimpleError::new(1, "error: invalid input"));
                     }
 
                     start += segment_len;
@@ -107,7 +107,7 @@ impl SupportsFastDecodeAndEncode for Base64SimdWrapper {
                     };
 
                     if decoder(remaining, output).is_err() {
-                        return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                        return Err(USimpleError::new(1, "error: invalid input"));
                     }
 
                     break;
@@ -117,7 +117,7 @@ impl SupportsFastDecodeAndEncode for Base64SimdWrapper {
             Ok(())
         } else {
             Self::decode_with_no_pad(input, output)
-                .map_err(|_| USimpleError::new(1, "error: invalid input".to_owned()))
+                .map_err(|_| USimpleError::new(1, "error: invalid input"))
         };
 
         if let Err(err) = decode_result {
@@ -295,7 +295,7 @@ impl SupportsFastDecodeAndEncode for Base58Wrapper {
             let digit = alphabet
                 .iter()
                 .position(|&b| b == byte)
-                .ok_or_else(|| USimpleError::new(1, "error: invalid input".to_owned()))?;
+                .ok_or_else(|| USimpleError::new(1, "error: invalid input"))?;
 
             // Multiply by 58 and add digit
             let mut carry = digit as u32;
@@ -426,13 +426,13 @@ impl SupportsFastDecodeAndEncode for Z85Wrapper {
 
     fn decode_into_vec(&self, input: &[u8], output: &mut Vec<u8>) -> UResult<()> {
         if input.first() == Some(&b'#') {
-            return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+            return Err(USimpleError::new(1, "error: invalid input"));
         }
 
         let decode_result = match z85::decode(input) {
             Ok(ve) => ve,
             Err(_de) => {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
         };
 
@@ -451,7 +451,7 @@ impl SupportsFastDecodeAndEncode for Z85Wrapper {
         if !input.len().is_multiple_of(4) {
             return Err(USimpleError::new(
                 1,
-                "error: invalid input (length must be multiple of 4 characters)".to_owned(),
+                "error: invalid input (length must be multiple of 4 characters)",
             ));
         }
 
@@ -477,7 +477,7 @@ impl SupportsFastDecodeAndEncode for EncodingWrapper {
         let decode_len_result = match self.encoding.decode_len(input.len()) {
             Ok(us) => us,
             Err(_de) => {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
         };
 
@@ -493,7 +493,7 @@ impl SupportsFastDecodeAndEncode for EncodingWrapper {
                 output.truncate(output_len + us);
             }
             Err(_de) => {
-                return Err(USimpleError::new(1, "error: invalid input".to_owned()));
+                return Err(USimpleError::new(1, "error: invalid input"));
             }
         }
 

src/uucore/src/lib/features/perms.rs

@@ -830,10 +830,7 @@ pub fn configure_symlink_and_recursion(
     if recursive {
         if traverse_symlinks == TraverseSymlinks::None {
             if dereference == Some(true) {
-                return Err(USimpleError::new(
-                    1,
-                    "-R --dereference requires -H or -L".to_string(),
-                ));
+                return Err(USimpleError::new(1, "-R --dereference requires -H or -L"));
             }
             dereference = Some(false);
         }