Style refactoring

uutils · Jan 22, 2025 · 2d7652a · 2d7652a
1 parent 78f6fb0
commit 2d7652a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs
@@ -273,7 +273,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         for date in dates {
             match date {
                 Ok(date) => {
-                    let format_string = custom_time_format(&format_string);
+                    let format_string = custom_time_format(format_string);
                     // Refuse to pass this string to chrono as it is crashing in this crate
                     if format_string.contains("%#z") {
                         return Err(USimpleError::new(

diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
@@ -19,7 +19,6 @@ path = "src/ls.rs"
 [dependencies]
 ansi-width = { workspace = true }
 chrono = { workspace = true }
-chrono-tz = { workspace = true }
 clap = { workspace = true, features = ["env"] }
 glob = { workspace = true }
 hostname = { workspace = true }

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -360,11 +360,9 @@ impl TimeStyle {
             //So it's not yet implemented
             (Self::Locale, true) => time.format("%b %e %H:%M").to_string(),
             (Self::Locale, false) => time.format("%b %e  %Y").to_string(),
-            (Self::Format(fmt), _) => {
-                // this line can be replaced with the one in timzone_date.rs
-                time.format(custom_tz_fmt::custom_time_format(fmt).as_str())
-                    .to_string()
-            }
+            (Self::Format(fmt), _) => time
+                .format(custom_tz_fmt::custom_time_format(fmt).as_str())
+                .to_string(),
         }
     }
 }

diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib/lib.rs"
 
 [dependencies]
 chrono = { workspace = true }
-chrono-tz = {workspace = true}
+chrono-tz = { workspace = true }
 clap = { workspace = true }
 uucore_procs = { workspace = true }
 number_prefix = { workspace = true }