Merge pull request #253 from rustcoreutils/cleanups

Cleanups

Author: jgarzik

dev/ar.rs

@@ -16,7 +16,7 @@ use std::os::unix::ffi::{OsStrExt, OsStringExt};
 use std::os::unix::fs::MetadataExt;
 use std::path::Path;
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 #[group(required = false, multiple = false)]
 struct InsertArgs {
     /// Insert the files after the specified member
@@ -28,7 +28,7 @@ struct InsertArgs {
     insert_before: bool,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct DeleteArgs {
     /// Give verbose output
     #[arg(short = 'v')]
@@ -38,15 +38,15 @@ struct DeleteArgs {
     files: Vec<OsString>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct MoveArgs {
     #[command(flatten)]
     insert_args: InsertArgs,
 
     files: Vec<OsString>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct PrintArgs {
     /// Give verbose output
     #[arg(short = 'v')]
@@ -60,7 +60,7 @@ struct PrintArgs {
     files: Vec<OsString>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct QuickAppendArgs {
     /// Suppress archive creation diagnostics
     #[arg(short = 'c')]
@@ -74,7 +74,7 @@ struct QuickAppendArgs {
     files: Vec<String>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct ReplaceArgs {
     /// Suppress archive creation diagnostics
     #[arg(short = 'c')]
@@ -94,7 +94,7 @@ struct ReplaceArgs {
     files: Vec<OsString>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct ListArgs {
     /// Give verbose output
     #[arg(short = 'v')]
@@ -108,7 +108,7 @@ struct ListArgs {
     files: Vec<OsString>,
 }
 
-#[derive(clap::Args, Debug)]
+#[derive(clap::Args)]
 struct ExtractArgs {
     /// Give verbose output
     #[arg(short = 'v')]
@@ -130,7 +130,7 @@ struct ExtractArgs {
     files: Vec<OsString>,
 }
 
-#[derive(Subcommand, Debug)]
+#[derive(Subcommand)]
 enum Commands {
     /// Delete one or more files from the archive
     #[command(name = "-d")]

dev/nm.rs

@@ -22,7 +22,7 @@ use plib::PROJECT_NAME;
 use std::collections::HashMap;
 use std::fs;
 
-#[derive(Debug, ValueEnum, Clone)]
+#[derive(ValueEnum, Clone)]
 enum OutputType {
     D,
     O,

dev/strings.rs

@@ -14,7 +14,7 @@ use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use object::{Object, ObjectSection};
 use plib::PROJECT_NAME;
 
-#[derive(Debug, Clone, Copy, ValueEnum)]
+#[derive(Clone, Copy, ValueEnum)]
 enum OffsetFormat {
     #[value(name = "d", help = "decimal")]
     Decimal,
@@ -24,7 +24,7 @@ enum OffsetFormat {
     Hex,
 }
 
-#[derive(clap::Args, Clone, Copy, Debug)]
+#[derive(clap::Args, Clone, Copy)]
 struct OutputOptions {
     /// Scan the input files in their entirety
     #[arg(short = 'a')]

file/dd.rs

@@ -71,14 +71,12 @@ const CONV_ASCII_EBCDIC: [u8; 256] = [
     0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 ];
 
-#[derive(Debug)]
 enum AsciiConv {
     Ascii,
     EBCDIC,
     IBM,
 }
 
-#[derive(Debug)]
 enum Conversion {
     Ascii(AsciiConv),
     Lcase,
@@ -89,7 +87,6 @@ enum Conversion {
     Sync,
 }
 
-#[derive(Debug)]
 struct Config {
     ifile: String,
     ofile: String,

file/find.rs

@@ -16,7 +16,7 @@ use std::path::PathBuf;
 use std::{env, fs};
 use walkdir::{DirEntry, WalkDir};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 enum Expr {
     And(Box<Expr>),
     Or(Box<Expr>),
@@ -38,7 +38,7 @@ enum Expr {
     Newer(PathBuf),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 enum FileType {
     BlockDevice,
     CharDevice,

m4/test-manager/src/main.rs

@@ -12,13 +12,13 @@ struct Args {
     fixtures_directory: PathBuf,
 }
 
-#[derive(Debug, clap::Subcommand)]
+#[derive(clap::Subcommand)]
 enum Commands {
     UpdateSnapshots(UpdateSnapshots),
 }
 
 /// Update the integration test snapshots.
-#[derive(Debug, clap::Args)]
+#[derive(clap::Args)]
 struct UpdateSnapshots {
     /// Optionally specify a secific test case name that you want to update, where name is
     /// {name}.m4 of the test case file.

plib/src/utmpx.rs

@@ -10,7 +10,6 @@
 use crate::platform::{self, endutxent, getutxent, setutxent};
 use std::ffi::CStr;
 
-#[derive(Debug)]
 pub struct Utmpx {
     pub user: String,
     pub id: String,

text/csplit.rs

@@ -45,14 +45,12 @@ struct Args {
     operands: Vec<String>,
 }
 
-#[derive(Debug)]
 enum Operand {
     Rx(Regex, isize, bool),
     LineNum(usize),
     Repeat(usize),
 }
 
-#[derive(Debug)]
 struct SplitOps {
     ops: Vec<Operand>,
 }

text/cut.rs

@@ -15,7 +15,7 @@ use plib::PROJECT_NAME;
 use std::path::PathBuf;
 
 /// Cut - cut out selected fields of each line of a file
-#[derive(Parser, Debug, Clone)]
+#[derive(Parser, Clone)]
 #[command(version, about)]
 struct Args {
     /// Cut based on a list of bytes
@@ -79,7 +79,7 @@ fn validate_args(args: &Args) -> Result<(), String> {
     Ok(())
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 enum ParseVariat {
     Bytes(Vec<(i32, i32)>),
     Characters(Vec<(i32, i32)>),

text/diff.rs

@@ -28,7 +28,7 @@ use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use plib::PROJECT_NAME;
 
 /// diff - compare two files
-#[derive(Parser, Debug, Clone)]
+#[derive(Parser, Clone)]
 #[command(version, about)]
 struct Args {
     /// Cause EOL whitespace to be treated as blanks