Apply 003.update-api-time: migrate Tm -> OffsetDateTime

crates/libtiny_logger/src/lib.rs

@@ -6,7 +6,7 @@ use std::io;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
-use time::Tm;
+use time::OffsetDateTime;
 
 use libtiny_common::{ChanName, ChanNameRef, MsgTarget};
 use libtiny_wire::formatting::remove_irc_control_chars;
@@ -50,26 +50,26 @@ impl Logger {
     delegate!(close_chan_tab(serv: &str, chan: &ChanNameRef,));
     delegate!(close_user_tab(serv: &str, nick: &str,));
     delegate!(add_client_msg(msg: &str, target: &MsgTarget,));
-    delegate!(add_msg(msg: &str, ts: Tm, target: &MsgTarget,));
+    delegate!(add_msg(msg: &str, ts: OffsetDateTime, target: &MsgTarget,));
     delegate!(add_privmsg(
         sender: &str,
         msg: &str,
-        ts: Tm,
+        ts: OffsetDateTime,
         target: &MsgTarget,
         highlight: bool,
         is_action: bool,
     ));
-    delegate!(add_nick(nick: &str, ts: Option<Tm>, target: &MsgTarget,));
-    delegate!(remove_nick(nick: &str, ts: Option<Tm>, target: &MsgTarget,));
+    delegate!(add_nick(nick: &str, ts: Option<OffsetDateTime>, target: &MsgTarget,));
+    delegate!(remove_nick(nick: &str, ts: Option<OffsetDateTime>, target: &MsgTarget,));
     delegate!(rename_nick(
         old_nick: &str,
         new_nick: &str,
-        ts: Tm,
+        ts: OffsetDateTime,
         target: &MsgTarget,
     ));
     delegate!(set_topic(
         topic: &str,
-        ts: Tm,
+        ts: OffsetDateTime,
         serv: &str,
         chan: &ChanNameRef,
     ));
@@ -105,7 +105,7 @@ fn print_header(fd: &mut File) -> io::Result<()> {
     writeln!(
         fd,
         "*** Logging started at {}",
-        time::strftime("%Y-%m-%d %H:%M:%S", &time::now()).unwrap()
+        time::OffsetDateTime::now_utc().format(&time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]").unwrap()).unwrap()
     )?;
     writeln!(fd)
 }
@@ -115,7 +115,7 @@ fn print_footer(fd: &mut File) -> io::Result<()> {
     writeln!(
         fd,
         "*** Logging ended at {}",
-        time::strftime("%Y-%m-%d %H:%M:%S", &time::now()).unwrap()
+        time::OffsetDateTime::now_utc().format(&time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]").unwrap()).unwrap()
     )?;
     writeln!(fd)
 }
@@ -292,7 +292,7 @@ impl LoggerInner {
         });
     }
 
-    fn add_msg(&mut self, msg: &str, ts: Tm, target: &MsgTarget) {
+    fn add_msg(&mut self, msg: &str, ts: OffsetDateTime, target: &MsgTarget) {
         self.apply_to_target(target, |fd: &mut File, report_err: &dyn Fn(String)| {
             report_io_err!(report_err, writeln!(fd, "[{}] {}", strf(&ts), msg));
         });
@@ -302,7 +302,7 @@ impl LoggerInner {
         &mut self,
         sender: &str,
         msg: &str,
-        ts: Tm,
+        ts: OffsetDateTime,
         target: &MsgTarget,
         _highlight: bool,
         is_action: bool,
@@ -318,7 +318,7 @@ impl LoggerInner {
         });
     }
 
-    fn add_nick(&mut self, nick: &str, ts: Option<Tm>, target: &MsgTarget) {
+    fn add_nick(&mut self, nick: &str, ts: Option<OffsetDateTime>, target: &MsgTarget) {
         if let Some(_ts) = ts {
             // This method is only called when a user joins a chan
             self.apply_to_target(target, |fd: &mut File, report_err: &dyn Fn(String)| {
@@ -330,7 +330,7 @@ impl LoggerInner {
         }
     }
 
-    fn remove_nick(&mut self, nick: &str, ts: Option<Tm>, target: &MsgTarget) {
+    fn remove_nick(&mut self, nick: &str, ts: Option<OffsetDateTime>, target: &MsgTarget) {
         if let Some(_ts) = ts {
             // TODO: Did the user leave a channel or the server? Currently we can't tell.
             self.apply_to_target(target, |fd: &mut File, report_err: &dyn Fn(String)| {
@@ -339,7 +339,7 @@ impl LoggerInner {
         }
     }
 
-    fn rename_nick(&mut self, old_nick: &str, new_nick: &str, ts: Tm, target: &MsgTarget) {
+    fn rename_nick(&mut self, old_nick: &str, new_nick: &str, ts: OffsetDateTime, target: &MsgTarget) {
         self.apply_to_target(target, |fd: &mut File, report_err: &dyn Fn(String)| {
             report_io_err!(
                 report_err,
@@ -354,7 +354,7 @@ impl LoggerInner {
         });
     }
 
-    fn set_topic(&mut self, topic: &str, ts: Tm, serv: &str, chan: &ChanNameRef) {
+    fn set_topic(&mut self, topic: &str, ts: OffsetDateTime, serv: &str, chan: &ChanNameRef) {
         let target = MsgTarget::Chan { serv, chan };
         self.apply_to_target(&target, |fd: &mut File, report_err: &dyn Fn(String)| {
             report_io_err!(
@@ -452,9 +452,9 @@ impl LoggerInner {
 }
 
 fn now() -> String {
-    time::strftime("%H:%M:%S", &time::now()).unwrap()
+    time::OffsetDateTime::now_utc().format(&time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]").unwrap()).unwrap()
 }
 
-fn strf(tm: &Tm) -> String {
-    time::strftime("%H:%M:%S", tm).unwrap()
+fn strf(tm: &OffsetDateTime) -> String {
+        tm.format(&time::format_description::parse("[hour]:[minute]:[second]").unwrap()).unwrap()
 }

crates/libtiny_tui/benches/bench.rs

@@ -129,7 +129,7 @@ fn tui_resize(b: &mut Bencher) {
     let server = "<server>";
     tui.new_server_tab(server, None);
 
-    let ts: Tm = time::empty_tm();
+    let ts: time::OffsetDateTime = time::empty_tm();
     let target = MsgTarget::CurrentTab;
 
     let f = File::open("test/lipsum.txt").unwrap();

crates/libtiny_tui/examples/bench.rs

@@ -49,7 +49,7 @@ fn run_bench() {
 
 async fn bench_task(tui: TUI, lines: Vec<String>) {
     let msg_target = MsgTarget::Server { serv: "mentions" };
-    let time = time::now();
+    let time = time::OffsetDateTime::now_utc();
 
     for line in &lines {
         tui.add_privmsg("server", line, time, &msg_target, false, false);

crates/libtiny_tui/examples/chat.rs

@@ -34,7 +34,7 @@ fn main() {
         tui.new_chan_tab("debug", ChanNameRef::new("chan"));
         tui.set_topic(
             "This is channel topic",
-            time::now(),
+            time::OffsetDateTime::now_utc(),
             SERV,
             ChanNameRef::new(CHAN),
         );
@@ -46,7 +46,7 @@ fn main() {
             file.read_to_string(&mut text).unwrap();
 
             for (line_idx, line) in text.lines().enumerate() {
-                let now = time::now();
+                let now = time::OffsetDateTime::now_utc();
                 let nick = format!("nick_{}", line_idx);
                 tui.add_nick(&nick, Some(now), &chan_target);
                 tui.add_privmsg(&nick, line, now, &chan_target, false, false);

crates/libtiny_tui/examples/completion.rs

@@ -20,7 +20,7 @@ fn main() {
 
         tui.add_msg(
             "Loading word list for auto-completion ...",
-            time::now(),
+            time::OffsetDateTime::now_utc(),
             &debug_tab,
         );
         tui.draw();
@@ -34,7 +34,7 @@ fn main() {
             }
         }
 
-        tui.add_msg("Done.", time::now(), &debug_tab);
+        tui.add_msg("Done.", time::OffsetDateTime::now_utc(), &debug_tab);
         tui.draw();
     });
 

crates/libtiny_tui/src/config.rs

@@ -493,7 +493,7 @@ pub(crate) fn parse_config(config_path: &Path) -> Result<Config, serde_yaml::Err
     // tiny creates a config file with the defaults when it can't find one, but the config file can
     // be deleted before a `/reload`.
     let contents = std::fs::read_to_string(config_path).map_err(|err| {
-        de::Error::custom(format!(
+        <serde_yaml::Error as de::Error>::custom(format!(
             "Can't read config file '{}': {}",
             config_path.to_string_lossy(),
             err

crates/libtiny_tui/src/lib.rs

@@ -33,7 +33,6 @@ use std::cell::RefCell;
 use std::path::PathBuf;
 use std::rc::{Rc, Weak};
 
-use time::Tm;
 use tokio::select;
 use tokio::signal::unix::{signal, SignalKind};
 use tokio::sync::mpsc;
@@ -240,30 +239,30 @@ impl TUI {
     delegate!(close_chan_tab(serv_name: &str, chan: &ChanNameRef,));
     delegate!(close_user_tab(serv_name: &str, nick: &str,));
     delegate!(add_client_msg(msg: &str, target: &MsgTarget,));
-    delegate!(add_msg(msg: &str, ts: Tm, target: &MsgTarget,));
-    delegate!(add_err_msg(msg: &str, ts: Tm, target: &MsgTarget,));
+    delegate!(add_msg(msg: &str, ts: time::OffsetDateTime, target: &MsgTarget,));
+    delegate!(add_err_msg(msg: &str, ts: time::OffsetDateTime, target: &MsgTarget,));
     delegate!(add_client_err_msg(msg: &str, target: &MsgTarget,));
     delegate!(clear_nicks(serv_name: &str,));
     delegate!(set_nick(serv_name: &str, new_nick: &str,));
     delegate!(add_privmsg(
         sender: &str,
         msg: &str,
-        ts: Tm,
+        ts: time::OffsetDateTime,
         target: &MsgTarget,
         highlight: bool,
         is_action: bool,
     ));
-    delegate!(add_nick(nick: &str, ts: Option<Tm>, target: &MsgTarget,));
-    delegate!(remove_nick(nick: &str, ts: Option<Tm>, target: &MsgTarget,));
+    delegate!(add_nick(nick: &str, ts: Option<time::OffsetDateTime>, target: &MsgTarget,));
+    delegate!(remove_nick(nick: &str, ts: Option<time::OffsetDateTime>, target: &MsgTarget,));
     delegate!(rename_nick(
         old_nick: &str,
         new_nick: &str,
-        ts: Tm,
+        ts: time::OffsetDateTime,
         target: &MsgTarget,
     ));
     delegate!(set_topic(
         topic: &str,
-        ts: Tm,
+        ts: time::OffsetDateTime,
         serv_name: &str,
         chan_name: &ChanNameRef,
     ));

crates/libtiny_tui/src/messaging.rs

@@ -2,7 +2,7 @@ use termbox_simple::Termbox;
 
 use std::convert::From;
 
-use time::{self, Tm};
+use time;
 
 use crate::config::Colors;
 use crate::exit_dialogue::ExitDialogue;
@@ -68,11 +68,11 @@ impl Timestamp {
     }
 }
 
-impl From<Tm> for Timestamp {
-    fn from(tm: Tm) -> Timestamp {
+impl From<time::OffsetDateTime> for Timestamp {
+    fn from(tm: time::OffsetDateTime) -> Timestamp {
         Timestamp {
-            hour: tm.tm_hour,
-            min: tm.tm_min,
+            hour: tm.hour() as i32,
+            min: tm.minute() as i32,
         }
     }
 }