Replace [chrono] with [time] to address [RUSTSEC-2020-0159]

[chrono]: https://crates.io/crates/chrono
[time]: https://crates.io/crates/time
[RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159

Author: kevinbader

CHANGELOG.md

@@ -6,23 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- next-header -->
-<!-- ## [Unreleased] - ReleaseDate -->
+## [Unreleased] - ReleaseDate
+
+Replaced [chrono] with [time] to address [RUSTSEC-2020-0159].
+
+[chrono]: https://crates.io/crates/chrono
+[time]: https://crates.io/crates/time
+[RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159
 
 ## [1.0.0] - 2022-03-29
 
 I'm using it regularly on Linux and MacOS. It works well and has all the features I need, so... happy v1.0! :tada: :rocket:
 
 ## [0.9.1] - 2022-03-28
 
-- Fix: When archiving, subprojects are cleaned but no longer attempted to be archived. This doesn't change the current behavior: subprojects are still included in the tar.xz file as-is and not as nested archives. But previously, the attempt to archive the subproject after the parent project produced an error, and the user needed to execute the command again to continue archiving the remaining projects.
+Fix: When archiving, subprojects are cleaned but no longer attempted to be archived. This doesn't change the current behavior: subprojects are still included in the tar.xz file as-is and not as nested archives. But previously, the attempt to archive the subproject after the parent project produced an error, and the user needed to execute the command again to continue archiving the remaining projects.
 
 ## [0.9.0] - 2022-03-26
 
-- Support multiple directories as input. For example:
+Support multiple directories as input. For example:
 
-  ```bash
-  makeclean -l ~/code ~/work ~/projects
-  ```
+```bash
+makeclean -l ~/code ~/work ~/projects
+```
 
 ## [0.8.0] - 2022-03-24
 

Cargo.lock

@@ -27,7 +27,6 @@ pre-release-replacements = [
 [dependencies]
 anyhow = "1.0.45"
 assert_fs = "1.0.7"
-chrono = "0.4.19"
 clap = { version = "3.1.3", features = [
     "derive",
     "env",
@@ -47,6 +46,7 @@ serde_yaml = "0.8.23"
 tabular = "0.1.4"
 tar = "0.4.38"
 thiserror = "1.0.30"
+time = { version = "0.3.9", features = ["formatting"] }
 toml = "0.5.8"
 tracing = "0.1.26"
 tracing-subscriber = { version = "0.3.8", features = ["json"] }

Cargo.toml

@@ -4,9 +4,9 @@
 
 use std::path::PathBuf;
 
-use chrono::Duration;
 use clap::Parser;
 use regex::Regex;
+use time::Duration;
 
 use crate::build_tools::BuildToolKind;
 

src/cli.rs

@@ -44,7 +44,7 @@ mod test {
         fixture::{FileWriteStr, PathChild, PathCreateDir},
         TempDir,
     };
-    use chrono::Duration;
+    use time::Duration;
 
     use crate::{
         build_tool_manager::BuildToolManager,
@@ -102,7 +102,7 @@ mod test {
 
     fn project_filter() -> ProjectFilter {
         ProjectFilter {
-            min_stale: Duration::zero(),
+            min_stale: Duration::ZERO,
             status: StatusFilter::Any,
         }
     }

src/find_projects.rs

@@ -7,7 +7,6 @@ pub mod project;
 
 use anyhow::Context;
 use build_tool_manager::BuildToolManager;
-use chrono::Duration;
 use clap::{CommandFactory, ErrorKind};
 use console::{colors_enabled, style};
 use dialoguer::{
@@ -20,6 +19,7 @@ use std::{
     io,
     path::{Path, PathBuf},
 };
+use time::Duration;
 use tracing::debug;
 
 pub use crate::cli::Cli;
@@ -32,7 +32,7 @@ use crate::{
 /// Prints projects to stdout.
 pub fn list(cli: Cli, build_tool_manager: BuildToolManager) -> anyhow::Result<()> {
     let project_filter = {
-        let min_stale = cli.min_stale.unwrap_or_else(Duration::zero);
+        let min_stale = cli.min_stale.unwrap_or(Duration::ZERO);
         let status = StatusFilter::Any;
         ProjectFilter { min_stale, status }
     };
@@ -272,8 +272,7 @@ fn pretty_print_project(project: &Project) -> anyhow::Result<()> {
         0 => String::new(),
         bytes => format!("; {}", format_size(bytes)),
     };
-    // See https://docs.rs/chrono/latest/chrono/format/strftime/index.html
-    let mtime = project.mtime.format("%F");
+    let mtime = project.mtime.to_string();
 
     let path = ProjectPath::from(project).render(use_color);
 

src/lib.rs

@@ -11,11 +11,11 @@ use crate::{
     build_tools::{BuildStatus, BuildTool},
 };
 use anyhow::format_err;
-use chrono::{DateTime, Duration, Local, Utc};
 use std::{
     fmt,
     path::{Path, PathBuf},
 };
+use time::{Duration, OffsetDateTime};
 use tracing::{trace, warn};
 
 use self::{mtime::dir_mtime, vcs::VersionControlSystem};
@@ -35,7 +35,7 @@ pub struct Project {
     /// The VCS, if under version control.
     pub vcs: Option<VersionControlSystem>,
     /// When this project was last modified (most recent commit timestamp).
-    pub mtime: DateTime<Utc>,
+    pub mtime: OffsetDateTime,
 }
 
 impl Project {
@@ -70,10 +70,9 @@ impl Project {
 
         let mtime = dir_mtime(path)
             .ok_or_else(|| format_err!("BUG: build tool recognized but no files?!"))?;
-        let mtime: DateTime<Local> = mtime.into();
-        let mtime: DateTime<Utc> = mtime.into();
+        let now = OffsetDateTime::now_utc();
 
-        if Utc::now().signed_duration_since(mtime) < project_filter.min_stale {
+        if (now - mtime) < project_filter.min_stale {
             trace!(
                 ?path,
                 %mtime,

src/project.rs

@@ -1,6 +1,7 @@
 //! Representation of a [`Project`] used for JSON output.
 
 use serde::{Deserialize, Serialize};
+use time::format_description::well_known::Rfc3339;
 
 use crate::Project;
 
@@ -19,7 +20,7 @@ pub struct ProjectDto {
     pub build_tools: Vec<String>,
     /// The VCS, if under version control.
     pub vcs: Option<VcsDto>,
-    /// When this project was last modified (most recent commit timestamp).
+    /// When this project was last modified (most recent commit timestamp), in RFC3339.
     pub mtime: String,
 }
 
@@ -34,7 +35,10 @@ impl From<&Project> for ProjectDto {
                 .map(|x| x.to_string())
                 .collect::<Vec<_>>(),
             vcs: project.vcs.as_ref().map(VcsDto::from),
-            mtime: project.mtime.to_rfc3339(),
+            mtime: project
+                .mtime
+                .format(&Rfc3339)
+                .expect("can format as RFC3339"),
         }
     }
 }

src/project/dto.rs

@@ -1,7 +1,8 @@
 use ignore::WalkBuilder;
-use std::{path::Path, time::SystemTime};
+use std::path::Path;
+use time::OffsetDateTime;
 
-pub(crate) fn dir_mtime(path: &Path) -> Option<SystemTime> {
+pub(crate) fn dir_mtime(path: &Path) -> Option<OffsetDateTime> {
     WalkBuilder::new(path)
         .standard_filters(true)
         .hidden(false)
@@ -10,5 +11,6 @@ pub(crate) fn dir_mtime(path: &Path) -> Option<SystemTime> {
         .filter_map(|entry| entry.metadata().ok())
         .filter(|metadata| metadata.is_file())
         .filter_map(|metadata| metadata.modified().ok())
+        .map(OffsetDateTime::from)
         .max()
 }