summaryrefslogtreecommitdiffstats
path: root/src/file.rs
diff options
context:
space:
mode:
authorBen S <ogham@bsago.me>2015-05-10 18:03:15 +0100
committerBen S <ogham@bsago.me>2015-05-10 18:03:15 +0100
commitc6d8c21e805adee457d0fdce3e8b04e184f7a3f8 (patch)
tree70184d57b8efd1f793ecf5834a7fa2b2c3841e1b /src/file.rs
parentd9319c48b427881a197d96a15b941534646f42ac (diff)
Finally, do the same for the Git column.
Diffstat (limited to 'src/file.rs')
-rw-r--r--src/file.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/file.rs b/src/file.rs
index 07fd30a..b179e76 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -7,7 +7,7 @@ use std::os::unix::raw::mode_t;
use std::os::unix::fs::{MetadataExt, PermissionsExt};
use std::path::{Component, Path, PathBuf};
-use ansi_term::{ANSIString, ANSIStrings, Colour, Style};
+use ansi_term::{ANSIString, ANSIStrings, Style};
use ansi_term::Style::Plain;
use ansi_term::Colour::Fixed;
@@ -31,10 +31,6 @@ use options::{SizeFormat, TimeType};
use output::details::UserLocale;
use feature::Attribute;
-/// This grey value is directly in between white and black, so it's guaranteed
-/// to show up on either backgrounded terminal.
-pub static GREY: Colour = Fixed(244);
-
/// A **File** is a wrapper around one of Rust's Path objects, along with
/// associated data about the file.
///
@@ -316,7 +312,7 @@ impl<'a> File<'a> {
/// cluttered with numbers.
fn file_size(&self, colours: &Colours, size_format: SizeFormat, locale: &locale::Numeric) -> Cell {
if self.is_directory() {
- Cell { text: GREY.paint("-").to_string(), length: 1 }
+ Cell { text: colours.punctuation.paint("-").to_string(), length: 1 }
}
else {
let result = match size_format {
@@ -425,7 +421,7 @@ impl<'a> File<'a> {
style.paint(character)
}
else {
- GREY.paint("-")
+ Fixed(244).paint("-")
}
}
@@ -477,7 +473,7 @@ impl<'a> File<'a> {
fn git_status(&self, colours: &Colours) -> Cell {
let status = match self.dir {
- None => GREY.paint("--").to_string(),
+ None => colours.punctuation.paint("--").to_string(),
Some(d) => {
let cwd = match current_dir() {
Err(_) => Path::new(".").join(&self.path),