From 2b11d773952fb45de8fa0a4360b67c160f24ed49 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 28 Apr 2022 08:22:48 +0200
Subject: [PATCH] time: Improve the l&f

---
 src/uu/touch/src/touch.rs            | 24 ++++++++++++++++--------
 src/uucore/Cargo.toml                |  2 +-
 src/uucore/src/lib/features/fsext.rs |  7 ++++++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs
index e74aaa700..9a4c0fe5d 100644
--- a/src/uu/touch/src/touch.rs
+++ b/src/uu/touch/src/touch.rs
@@ -247,7 +247,8 @@ fn stat(path: &Path, follow: bool) -> UResult<(FileTime, FileTime)> {
 }
 
 const POSIX_LOCALE_FORMAT: &[time::format_description::FormatItem] = format_description!(
-    "[weekday repr:short] [month repr:short] [day padding:space] [hour]:[minute]:[second] [year]"
+    "[weekday repr:short] [month repr:short] [day padding:space] \
+    [hour]:[minute]:[second] [year]"
 );
 
 const ISO_8601_FORMAT: &[time::format_description::FormatItem] =
@@ -294,20 +295,27 @@ fn parse_date(s: &str) -> UResult<FileTime> {
 
 // "%Y%m%d%H%M.%S" 15 chars
 const YYYYMMDDHHMM_DOT_SS_FORMAT: &[time::format_description::FormatItem] = format_description!(
-    "[year repr:full][month repr:numerical padding:zero][day][hour][minute].[second]"
+    "[year repr:full][month repr:numerical padding:zero]\
+    [day][hour][minute].[second]"
 );
 
 // "%Y%m%d%H%M" 12 chars
-const YYYYMMDDHHMM_FORMAT: &[time::format_description::FormatItem] =
-    format_description!("[year repr:full][month repr:numerical padding:zero][day][hour][minute]");
+const YYYYMMDDHHMM_FORMAT: &[time::format_description::FormatItem] = format_description!(
+    "[year repr:full][month repr:numerical padding:zero]\
+    [day][hour][minute]"
+);
 
 // "%y%m%d%H%M.%S" 13 chars
-const YYMMDDHHMM_DOT_SS_FORMAT: &[time::format_description::FormatItem] =
-    format_description!("[year repr:last_two padding:none][month][day][hour][minute].[second]");
+const YYMMDDHHMM_DOT_SS_FORMAT: &[time::format_description::FormatItem] = format_description!(
+    "[year repr:last_two padding:none][month][day]\
+    [hour][minute].[second]"
+);
 
 // "%y%m%d%H%M" 10 chars
-const YYMMDDHHMM_FORMAT: &[time::format_description::FormatItem] =
-    format_description!("[year repr:last_two padding:none][month padding:zero][day padding:zero][hour repr:24 padding:zero][minute padding:zero]");
+const YYMMDDHHMM_FORMAT: &[time::format_description::FormatItem] = format_description!(
+    "[year repr:last_two padding:none][month padding:zero][day padding:zero]\
+    [hour repr:24 padding:zero][minute padding:zero]"
+);
 
 fn parse_timestamp(s: &str) -> UResult<FileTime> {
     // TODO: handle error
diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
index 5b363376d..c86a8cf07 100644
--- a/src/uucore/Cargo.toml
+++ b/src/uucore/Cargo.toml
@@ -26,7 +26,7 @@ wild = "2.0"
 # * optional
 itertools = { version="0.10.0", optional=true }
 thiserror = { version="1.0", optional=true }
-time = { version="<= 0.3.10", optional=true, features = ["formatting", "local-offset", "macros"] }
+time = { version="<= 0.3", optional=true, features = ["formatting", "local-offset", "macros"] }
 # * "problem" dependencies (pinned)
 data-encoding = { version="2.1", optional=true }
 data-encoding-macro = { version="0.1.12", optional=true }
diff --git a/src/uucore/src/lib/features/fsext.rs b/src/uucore/src/lib/features/fsext.rs
index 3f5b2b77c..3d7ca1c1f 100644
--- a/src/uucore/src/lib/features/fsext.rs
+++ b/src/uucore/src/lib/features/fsext.rs
@@ -734,7 +734,12 @@ where
 }
 
 // match strftime "%Y-%m-%d %H:%M:%S.%f %z"
-const PRETTY_DATETIME_FORMAT: &[time::format_description::FormatItem] = format_description!("[year]-[month]-[day padding:zero] [hour]:[minute]:[second].[subsecond digits:9] [offset_hour sign:mandatory][offset_minute]");
+const PRETTY_DATETIME_FORMAT: &[time::format_description::FormatItem] = format_description!(
+    "\
+[year]-[month]-[day padding:zero] \
+[hour]:[minute]:[second].[subsecond digits:9] \
+[offset_hour sign:mandatory][offset_minute]"
+);
 
 pub fn pretty_time(sec: i64, nsec: i64) -> String {
     // sec == seconds since UNIX_EPOCH