Răsfoiți Sursa

Update #[derive] names

Ben S 11 ani în urmă
părinte
comite
22a4dc90b9
4 a modificat fișierele cu 6 adăugiri și 14 ștergeri
  1. 3 8
      src/column.rs
  2. 1 2
      src/filetype.rs
  3. 1 3
      src/options.rs
  4. 1 1
      src/output.rs

+ 3 - 8
src/column.rs

@@ -2,7 +2,7 @@ use std::iter::repeat;
 
 use ansi_term::Style;
 
-#[derive(PartialEq, Show)]
+#[derive(PartialEq, Debug, Copy)]
 pub enum Column {
     Permissions,
     FileName,
@@ -14,25 +14,20 @@ pub enum Column {
     Inode,
 }
 
-impl Copy for Column { }
-
-#[derive(PartialEq, Show)]
+#[derive(PartialEq, Debug, Copy)]
 pub enum SizeFormat {
     DecimalBytes,
     BinaryBytes,
     JustBytes,
 }
 
-impl Copy for SizeFormat { }
-
 /// Each column can pick its own **Alignment**. Usually, numbers are
 /// right-aligned, and text is left-aligned.
+#[derive(Copy)]
 pub enum Alignment {
     Left, Right,
 }
 
-impl Copy for Alignment { }
-
 impl Column {
 
     /// Get the alignment this column should use.

+ 1 - 2
src/filetype.rs

@@ -8,13 +8,12 @@ use ansi_term::Style;
 use ansi_term::Style::Plain;
 use ansi_term::Colour::{Red, Green, Yellow, Blue, Cyan, Fixed};
 
+#[derive(Copy)]
 pub enum FileType {
     Normal, Directory, Executable, Immediate, Compiled, Symlink, Special,
     Image, Video, Music, Lossless, Compressed, Document, Temp, Crypto,
 }
 
-impl Copy for FileType { }
-
 static IMAGE_TYPES: &'static [&'static str] = &[
     "png", "jpeg", "jpg", "gif", "bmp", "tiff", "tif",
     "ppm", "pgm", "pbm", "pnm", "webp", "raw", "arw",

+ 1 - 3
src/options.rs

@@ -109,13 +109,11 @@ impl Options {
 }
 
 /// User-supplied field to sort by
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Debug, Copy)]
 pub enum SortField {
     Unsorted, Name, Extension, Size, FileInode
 }
 
-impl Copy for SortField { }
-
 impl SortField {
 
     /// Find which field to use based on a user-supplied word.

+ 1 - 1
src/output.rs

@@ -8,7 +8,7 @@ use users::OSUsers;
 
 use ansi_term::Style::Plain;
 
-#[derive(PartialEq, Show)]
+#[derive(PartialEq, Debug)]
 pub enum View {
     Details(Vec<Column>, bool),
     Lines,