summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ivy III <rivy.dev@gmail.com>2019-11-20 19:18:59 -0600
committerPierre Peltier <dev@halium.fr>2019-12-04 11:09:11 +0100
commita3b162202ae1e20d2c3fb6df6285cf3e0f1ff60e (patch)
treef635fb451b54d669e03119ff66190dc3cff169e2
parent07213ac22f149933215bc1888cd71ebe0660f2f7 (diff)
refactor/polish ~ fix `cargo fmt` complaints
-rw-r--r--src/display.rs10
-rw-r--r--src/flags.rs10
-rw-r--r--src/meta/mod.rs7
-rw-r--r--src/meta/size.rs20
4 files changed, 29 insertions, 18 deletions
diff --git a/src/display.rs b/src/display.rs
index 40a75ea..e468694 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -74,9 +74,9 @@ fn inner_display_one_line(
continue;
}
- if flags.prefix_indent {
- output.push_str(" ");
- }
+ if flags.prefix_indent {
+ output.push_str(" ");
+ }
if let Layout::OneLine { long: true } = flags.layout {
output += &get_long_output(&meta, &colors, &icons, &flags, padding_rules.unwrap());
@@ -407,7 +407,7 @@ fn detect_size_lengths(metas: &[Meta], flags: &Flags) -> (usize, usize) {
let unit = meta.size.get_unit(flags);
let value_len = meta.size.render_value(&unit).len();
let unit_len = Size::render_unit(&unit, &flags).len();
-
+
if value_len > max_value_length {
max_value_length = value_len;
}
@@ -439,7 +439,7 @@ fn detect_name_with_symlink_length(metas: &[Meta], icons: &Icons, flags: &Flags)
for meta in metas {
let mut len = meta.name.name_string(&icons).len() + meta.indicator.len(&flags);
if let Some(syml) = meta.symlink.symlink_string() {
- len += syml.len() + 3 // 3 = ( arrow + 2 spaces) for symlink;
+ len += syml.len() + 3 // 3 = ( arrow + 2 spaces) for symlink;
}
if len > max_value_length {
max_value_length = len;
diff --git a/src/flags.rs b/src/flags.rs
index abe3d3c..1771141 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -103,7 +103,10 @@ impl Flags {
let glob = match Glob::new(pattern) {
Ok(g) => g,
Err(e) => {
- return Err(Error::with_description(&e.to_string(), ErrorKind::ValueValidation));
+ return Err(Error::with_description(
+ &e.to_string(),
+ ErrorKind::ValueValidation,
+ ));
}
};
ignore_globs_builder.add(glob);
@@ -112,7 +115,10 @@ impl Flags {
let ignore_globs = match ignore_globs_builder.build() {
Ok(globs) => globs,
Err(e) => {
- return Err(Error::with_description(&e.to_string(), ErrorKind::ValueValidation));
+ return Err(Error::with_description(
+ &e.to_string(),
+ ErrorKind::ValueValidation,
+ ));
}
};
diff --git a/src/meta/mod.rs b/src/meta/mod.rs
index 86a103b..3c1c9d8 100644
--- a/src/meta/mod.rs
+++ b/src/meta/mod.rs
@@ -96,16 +96,15 @@ impl Meta {
let path = entry?.path();
let name = path
- .file_name()
- .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))?;
+ .file_name()
+ .ok_or_else(|| Error::new(ErrorKind::InvalidInput, "invalid file name"))?;
if ignore_globs.is_match(&name) {
continue;
}
if let Display::DisplayOnlyVisible = display {
- if name.to_string_lossy().starts_with('.')
- {
+ if name.to_string_lossy().starts_with('.') {
continue;
}
}
diff --git a/src/meta/size.rs b/src/meta/size.rs
index a4e4225..24e5bc3 100644
--- a/src/meta/size.rs
+++ b/src/meta/size.rs
@@ -33,8 +33,7 @@ impl Size {
self.bytes
}
- pub fn get_unit(&self, flags: &Flags) -> Unit
- {
+ pub fn get_unit(&self, flags: &Flags) -> Unit {
if self.bytes < 1024 || flags.size == SizeFlag::Bytes {
Unit::Byte
} else if self.bytes < 1024 * 1024 {
@@ -95,10 +94,17 @@ impl Size {
match unit {
Unit::None => "".to_string(),
Unit::Byte => self.bytes.to_string(),
- Unit::Kilo => ((( self.bytes as f64 ) / 1024.0 * 10.0).round() / 10.0).to_string(),
- Unit::Mega => ((( self.bytes as f64 ) / (1024.0 * 1024.0) * 10.0).round() / 10.0).to_string(),
- Unit::Giga => ((( self.bytes as f64 ) / (1024.0 * 1024.0 * 1024.0) * 10.0).round() / 10.0).to_string(),
- Unit::Tera => ((( self.bytes as f64 ) / (1024.0 * 1024.0 * 1024.0 * 1024.0) * 10.0).round() / 10.0).to_string(),
+ Unit::Kilo => (((self.bytes as f64) / 1024.0 * 10.0).round() / 10.0).to_string(),
+ Unit::Mega => {
+ (((self.bytes as f64) / (1024.0 * 1024.0) * 10.0).round() / 10.0).to_string()
+ }
+ Unit::Giga => (((self.bytes as f64) / (1024.0 * 1024.0 * 1024.0) * 10.0).round()
+ / 10.0)
+ .to_string(),
+ Unit::Tera => {
+ (((self.bytes as f64) / (1024.0 * 1024.0 * 1024.0 * 1024.0) * 10.0).round() / 10.0)
+ .to_string()
+ }
}
}
@@ -120,7 +126,7 @@ impl Size {
Unit::Giga => String::from("G"),
Unit::Tera => String::from("T"),
},
- SizeFlag::Bytes => String::from("")
+ SizeFlag::Bytes => String::from(""),
}
}
}