Fix CVE-2022-24713, fix clippy lints

Author: PicoJr

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.3.1](https://crates.io/crates/rtw/2.3.1) Jun 6, 2021
 
+* Fix CVE-2022-24713
 * Remove superfluous config crate features, fixes CVE-2020-25573.
 * Bump `htp` to `0.4.0` cf [htp changelog](https://github.com/PicoJr/htp/blob/master/CHANGELOG.md)
 

Cargo.lock

@@ -32,5 +32,8 @@ chrono-humanize = "0.1.2"
 
 [dev-dependencies]
 tempfile = "3"
-assert_cmd = "0.12"
-predicates = "1.0.4"
+assert_cmd = "2.0.4"
+predicates = "2.1.1"
+
+# Fix CVE-2022-24713
+regex = "1.5.5"

Cargo.toml

@@ -363,10 +363,7 @@ pub fn parse_stop_args(
     stop_m: &ArgMatches,
     clock: &dyn Clock,
 ) -> anyhow::Result<(Time, Option<ActivityId>)> {
-    let stopped_id_maybe = stop_m
-        .value_of("id")
-        .map(|id_str| usize::from_str(id_str))
-        .transpose()?;
+    let stopped_id_maybe = stop_m.value_of("id").map(usize::from_str).transpose()?;
     let time_arg = stop_m.values_of("time");
     if let Some(values) = time_arg {
         let values: Vec<String> = values.map(String::from).collect();
@@ -379,18 +376,12 @@ pub fn parse_stop_args(
 }
 
 pub fn parse_continue_args(continue_m: &ArgMatches) -> anyhow::Result<Option<ActivityId>> {
-    let continue_id_maybe = continue_m
-        .value_of("id")
-        .map(|id_str| usize::from_str(id_str))
-        .transpose()?;
+    let continue_id_maybe = continue_m.value_of("id").map(usize::from_str).transpose()?;
     Ok(continue_id_maybe)
 }
 
 pub fn parse_cancel_args(cancel_m: &ArgMatches) -> anyhow::Result<Option<ActivityId>> {
-    let cancelled_id_maybe = cancel_m
-        .value_of("id")
-        .map(|id_str| usize::from_str(id_str))
-        .transpose()?;
+    let cancelled_id_maybe = cancel_m.value_of("id").map(usize::from_str).transpose()?;
     Ok(cancelled_id_maybe)
 }
 
@@ -456,9 +447,7 @@ pub fn parse_timeline_args(
 }
 
 pub fn parse_delete_args(delete_m: &ArgMatches) -> anyhow::Result<ActivityId> {
-    let id_opt = delete_m
-        .value_of("id")
-        .map(|id_str| usize::from_str(id_str));
+    let id_opt = delete_m.value_of("id").map(usize::from_str);
     if let Some(Ok(id)) = id_opt {
         Ok(id)
     } else {

src/cli_helper.rs

@@ -192,7 +192,7 @@ pub(crate) fn render_days(activities: &[Interval], colors: &[Rgb]) -> anyhow::Re
     for day in min_day..=max_day {
         let day_activities: Vec<Interval> = activities
             .iter()
-            .flat_map(|interval| split_interval(interval))
+            .flat_map(split_interval)
             .filter(|(_, a)| {
                 let start_time: DateTime<Local> = a.get_start_time().into();
                 start_time.num_days_from_ce() == day
@@ -241,14 +241,14 @@ pub(crate) fn render_days(activities: &[Interval], colors: &[Rgb]) -> anyhow::Re
                 if j == 0 {
                     rendered.push(format!("{}{:>8}", line, day_month));
                 } else {
-                    rendered.push(format!("{}{:>8}", line, " ".to_string()));
+                    rendered.push(format!("{}{:>8}", line, " "));
                 }
             }
             for (j, line) in data_timelines.iter().enumerate() {
                 if j == 0 {
                     rendered.push(format!("{}{}", line, total_string));
                 } else {
-                    rendered.push(format!("{}{:>8}", line, " ".to_string()));
+                    rendered.push(format!("{}{:>8}", line, " "));
                 }
             }
         }