move from chrono to time

chrono seems a bit unmaintained, and has a more awkward api

7 files changed, 62 insertions, 58 deletions

diff --git a/Cargo.lock b/Cargo.lock
index c3b8df9..3545664 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,19 +200,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "time",
- "winapi",
-]
-
-[[package]]
 name = "concurrent-queue"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -407,7 +394,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-std",
- "chrono",
  "futures-lite",
  "hostname",
  "libc",
@@ -417,6 +403,7 @@ dependencies = [
  "signal-hook-async-std",
  "terminal_size",
  "textmode",
+ "time",
  "unicode-width",
  "users",
  "vt100",
@@ -436,25 +423,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
 name = "num_cpus"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -635,13 +603,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.44"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
 dependencies = [
+ "itoa",
  "libc",
- "wasi",
- "winapi",
 ]
 
 [[package]]
@@ -726,12 +693,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
 name = "wasm-bindgen"
 version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index e887c1d..727bb9b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,6 @@ license = "MIT"
 [dependencies]
 anyhow = "1.0.51"
 async-std = { version = "1.10.0", features = ["unstable"] }
-chrono = "0.4.19"
 futures-lite = "1.12.0"
 hostname = "0.3.1"
 libc = "0.2.109"
@@ -18,6 +17,7 @@ signal-hook = "0.3.10"
 signal-hook-async-std = "0.2.1"
 terminal_size = "0.1.17"
 textmode = { path = "../textmode", version = "0.2.2", features = ["async"] }
+time = { version = "0.3.5", features = ["formatting", "parsing"] }
 unicode-width = "0.1.9"
 users = "0.11.0"
 vt100 = { path = "../vt100-rust", version = "0.14.0" }
diff --git a/src/format.rs b/src/format.rs
index 50424f0..9086500 100644
--- a/src/format.rs
+++ b/src/format.rs
@@ -12,6 +12,12 @@ pub fn exit_status(status: std::process::ExitStatus) -> String {
     }
 }
 
+pub fn time(time: time::OffsetDateTime) -> String {
+    let format =
+        time::format_description::parse("[hour]:[minute]:[second]").unwrap();
+    time.format(&format).unwrap()
+}
+
 pub fn duration(dur: std::time::Duration) -> String {
     let secs = dur.as_secs();
     let nanos = dur.subsec_nanos();
diff --git a/src/history.rs b/src/history.rs
index 34093c3..bf09856 100644
--- a/src/history.rs
+++ b/src/history.rs
@@ -29,6 +29,7 @@ impl History {
         out: &mut textmode::Output,
         repl_lines: usize,
         focus: Option<usize>,
+        offset: time::UtcOffset,
     ) -> anyhow::Result<()> {
         let mut used_lines = repl_lines;
         let mut pos = None;
@@ -47,7 +48,7 @@ impl History {
                 (self.size.0 as usize - used_lines).try_into().unwrap(),
                 0,
             );
-            entry.render(out, self.size.1, focused);
+            entry.render(out, self.size.1, focused, offset);
             if focused {
                 pos = Some(out.screen().cursor_position());
             }
@@ -141,7 +142,7 @@ struct HistoryEntry {
     fullscreen: Option<bool>,
     input: async_std::channel::Sender<Vec<u8>>,
     resize: async_std::channel::Sender<(u16, u16)>,
-    start_time: chrono::DateTime<chrono::Local>,
+    start_time: time::OffsetDateTime,
     start_instant: std::time::Instant,
     exit_info: Option<ExitInfo>,
 }
@@ -161,7 +162,7 @@ impl HistoryEntry {
             input,
             resize,
             fullscreen: None,
-            start_time: chrono::Local::now(),
+            start_time: time::OffsetDateTime::now_utc(),
             start_instant: std::time::Instant::now(),
             exit_info: None,
         }
@@ -172,6 +173,7 @@ impl HistoryEntry {
         out: &mut textmode::Output,
         width: u16,
         focused: bool,
+        offset: time::UtcOffset,
     ) {
         out.set_bgcolor(textmode::Color::Rgb(32, 32, 32));
         if let Some(info) = self.exit_info {
@@ -205,11 +207,14 @@ impl HistoryEntry {
         let time = if let Some(info) = self.exit_info {
             format!(
                 "[{} ({:6})]",
-                self.start_time.time().format("%H:%M:%S"),
+                crate::format::time(self.start_time.to_offset(offset)),
                 crate::format::duration(info.instant - self.start_instant)
             )
         } else {
-            format!("[{}]", self.start_time.time().format("%H:%M:%S"))
+            format!(
+                "[{}]",
+                crate::format::time(self.start_time.to_offset(offset))
+            )
         };
         let cur_pos = out.screen().cursor_position();
         out.write_str(
diff --git a/src/main.rs b/src/main.rs
index 2f850e8..0220ab9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,6 +15,26 @@ mod util;
 
 use async_std::stream::StreamExt as _;
 
+// the time crate is currently unable to get the local offset on unix due to
+// soundness concerns, so we have to do it manually/:
+//
+// https://github.com/time-rs/time/issues/380
+fn get_offset() -> time::UtcOffset {
+    let offset_str =
+        std::process::Command::new("date").args(&["+%:z"]).output();
+    if let Ok(offset_str) = offset_str {
+        let offset_str = String::from_utf8(offset_str.stdout).unwrap();
+        time::UtcOffset::parse(
+            offset_str.trim(),
+            &time::format_description::parse("[offset_hour]:[offset_minute]")
+                .unwrap(),
+        )
+        .unwrap_or(time::UtcOffset::UTC)
+    } else {
+        time::UtcOffset::UTC
+    }
+}
+
 async fn resize(
     action_w: &async_std::channel::Sender<crate::action::Action>,
 ) {
@@ -39,7 +59,7 @@ async fn async_main() -> anyhow::Result<()> {
 
     let (action_w, action_r) = async_std::channel::unbounded();
 
-    let state = state::State::new();
+    let state = state::State::new(get_offset());
     state.render(&mut output, true).await.unwrap();
 
     let state = util::mutex(state);
@@ -77,7 +97,7 @@ async fn async_main() -> anyhow::Result<()> {
         let action_w = action_w.clone();
         async_std::task::spawn(async move {
             let first_sleep = 1_000_000_000_u64.saturating_sub(
-                chrono::Local::now().timestamp_subsec_nanos().into(),
+                time::OffsetDateTime::now_utc().nanosecond().into(),
             );
             async_std::task::sleep(std::time::Duration::from_nanos(
                 first_sleep,
diff --git a/src/readline.rs b/src/readline.rs
index 8b3c847..aef817a 100644
--- a/src/readline.rs
+++ b/src/readline.rs
@@ -57,6 +57,7 @@ impl Readline {
         &self,
         out: &mut textmode::Output,
         focus: bool,
+        offset: time::UtcOffset,
     ) -> anyhow::Result<()> {
         let mut pwd = std::env::current_dir()?.display().to_string();
         let home = std::env::var("HOME")?;
@@ -74,7 +75,9 @@ impl Readline {
         }
         let id = format!("{}@{}", user, hostname);
         let idlen: u16 = id.len().try_into().unwrap();
-        let time = chrono::Local::now().format("%H:%M:%S").to_string();
+        let time = crate::format::time(
+            time::OffsetDateTime::now_utc().to_offset(offset),
+        );
         let timelen: u16 = time.len().try_into().unwrap();
 
         out.move_to(self.size.0 - 2, 0);
diff --git a/src/state.rs b/src/state.rs
index 155034e..a312d91 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -7,10 +7,11 @@ pub struct State {
     scene: Scene,
     escape: bool,
     hide_readline: bool,
+    offset: time::UtcOffset,
 }
 
 impl State {
-    pub fn new() -> Self {
+    pub fn new(offset: time::UtcOffset) -> Self {
         let readline = crate::readline::Readline::new();
         let history = crate::history::History::new();
         let focus = Focus::Readline;
@@ -22,6 +23,7 @@ impl State {
             scene,
             escape: false,
             hide_readline: false,
+            offset,
         }
     }
 
@@ -111,19 +113,26 @@ impl State {
             Scene::Readline => match self.focus {
                 Focus::Readline => {
                     self.history
-                        .render(out, self.readline.lines(), None)
+                        .render(out, self.readline.lines(), None, self.offset)
                         .await?;
-                    self.readline.render(out, true).await?;
+                    self.readline.render(out, true, self.offset).await?;
                 }
                 Focus::History(idx) => {
                     if self.hide_readline {
-                        self.history.render(out, 0, Some(idx)).await?;
+                        self.history
+                            .render(out, 0, Some(idx), self.offset)
+                            .await?;
                     } else {
                         self.history
-                            .render(out, self.readline.lines(), Some(idx))
+                            .render(
+                                out,
+                                self.readline.lines(),
+                                Some(idx),
+                                self.offset,
+                            )
                             .await?;
                         let pos = out.screen().cursor_position();
-                        self.readline.render(out, false).await?;
+                        self.readline.render(out, false, self.offset).await?;
                         out.move_to(pos.0, pos.1);
                     }
                 }