summaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorBen S <ogham@bsago.me>2015-06-08 21:33:39 +0100
committerBen S <ogham@bsago.me>2015-06-08 21:33:39 +0100
commit2d8a9b49bee97fdbdca4ce6c48ca813de6869e1b (patch)
tree6a04ae04628ed3bf308d60ef8f075fa537fc8a8a /src/output
parent549f59092c7dcbeb5fe619cb841c8a8a87b877e9 (diff)
Various unimportant style changes
Diffstat (limited to 'src/output')
-rw-r--r--src/output/details.rs23
-rw-r--r--src/output/grid.rs6
-rw-r--r--src/output/lines.rs2
-rw-r--r--src/output/mod.rs12
4 files changed, 26 insertions, 17 deletions
diff --git a/src/output/details.rs b/src/output/details.rs
index 44b5f96..84da4de 100644
--- a/src/output/details.rs
+++ b/src/output/details.rs
@@ -1,25 +1,25 @@
use colours::Colours;
use column::{Alignment, Column, Cell};
-use feature::Attribute;
use dir::Dir;
-use file::File;
+use feature::Attribute;
use file::fields as f;
+use file::File;
use options::{Columns, FileFilter, RecurseOptions, SizeFormat};
-use users::{OSUsers, Users};
-use users::mock::MockUsers;
-
-use super::filename;
-
use ansi_term::{ANSIString, ANSIStrings, Style};
+use datetime::local::{LocalDateTime, DatePiece};
+use datetime::format::{DateFormat};
+use datetime::zoned::{VariableOffset, TimeZone};
+
use locale;
use number_prefix::{binary_prefix, decimal_prefix, Prefixed, Standalone, PrefixNames};
-use datetime::local::{LocalDateTime, DatePiece};
-use datetime::format::{DateFormat};
-use datetime::zoned::{VariableOffset, TimeZone};
+use users::{OSUsers, Users};
+use users::mock::MockUsers;
+
+use super::filename;
/// With the **Details** view, the output gets formatted into columns, with
@@ -97,6 +97,7 @@ impl Details {
}
}
+
struct Row {
/// Vector of cells to display.
@@ -122,6 +123,7 @@ struct Row {
children: bool,
}
+
/// A **Table** object gets built up by the view as it lists files and
/// directories.
pub struct Table<U> {
@@ -427,6 +429,7 @@ impl<U> Table<U> where U: Users {
}
}
+
#[derive(PartialEq, Debug, Clone)]
enum TreePart {
diff --git a/src/output/grid.rs b/src/output/grid.rs
index 0c2e950..0782ea3 100644
--- a/src/output/grid.rs
+++ b/src/output/grid.rs
@@ -1,11 +1,13 @@
+use std::cmp::max;
+use std::iter::repeat;
+
use colours::Colours;
use column::Alignment::Left;
use file::File;
use filetype::file_colour;
+
use super::lines::Lines;
-use std::cmp::max;
-use std::iter::repeat;
#[derive(PartialEq, Debug, Copy, Clone)]
pub struct Grid {
diff --git a/src/output/lines.rs b/src/output/lines.rs
index bd1fcdc..1d6dade 100644
--- a/src/output/lines.rs
+++ b/src/output/lines.rs
@@ -1,7 +1,9 @@
use colours::Colours;
use file::File;
+
use super::filename;
+
#[derive(Clone, Copy, Debug, PartialEq)]
pub struct Lines {
pub colours: Colours,
diff --git a/src/output/mod.rs b/src/output/mod.rs
index ebb11ce..ea48507 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -1,16 +1,18 @@
-mod grid;
-pub mod details;
-mod lines;
+use ansi_term::ANSIStrings;
use colours::Colours;
use file::File;
use filetype::file_colour;
-use ansi_term::ANSIStrings;
-pub use self::grid::Grid;
pub use self::details::Details;
+pub use self::grid::Grid;
pub use self::lines::Lines;
+mod grid;
+pub mod details;
+mod lines;
+
+
pub fn filename(file: &File, colours: &Colours) -> String {
if file.is_link() {
symlink_filename(file, colours)