diff --git a/src/column.rs b/src/column.rs index 881712d..8e97aac 100644 --- a/src/column.rs +++ b/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. diff --git a/src/filetype.rs b/src/filetype.rs index 605c7f1..81a6095 100644 --- a/src/filetype.rs +++ b/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", diff --git a/src/options.rs b/src/options.rs index 2c03f53..e625833 100644 --- a/src/options.rs +++ b/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. diff --git a/src/output.rs b/src/output.rs index 948451f..e4df83d 100644 --- a/src/output.rs +++ b/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, bool), Lines,