fix: adjust tests to new Rust version (#259)

- Adjust forget unit tests: Make timestamps unique - Apply clippy hint
rustic-rs · Sep 6, 2024 · ed3d5ae · ed3d5ae
1 parent 10ce882
commit ed3d5ae
Show file tree

Hide file tree

Showing 46 changed files with 772 additions and 773 deletions.
diff --git a/crates/core/src/commands/forget.rs b/crates/core/src/commands/forget.rs
@@ -672,23 +672,23 @@ mod tests {
         ];
 
         let by_date_and_tag = [
-            ("2014-10-01 10:20:30", "foo"),
-            ("2014-10-02 10:20:30", "foo"),
-            ("2014-10-05 10:20:30", "foo"),
-            ("2014-10-06 10:20:30", "foo"),
-            ("2014-10-08 10:20:30", "foo"),
-            ("2014-10-09 10:20:30", "foo"),
-            ("2014-10-10 10:20:30", "foo"),
-            ("2014-10-11 10:20:30", "foo"),
-            ("2014-10-20 10:20:30", "foo"),
-            ("2014-10-22 10:20:30", "foo"),
-            ("2014-11-08 10:20:30", "foo"),
-            ("2014-11-10 10:20:30", "foo"),
-            ("2014-11-12 10:20:30", "foo"),
-            ("2014-11-13 10:20:30", "foo"),
-            ("2014-11-15 10:20:30", "foo,bar"),
-            ("2015-10-22 10:20:30", "foo,bar"),
-            ("2015-10-22 10:20:30", "foo,bar"),
+            ("2014-10-01 10:20:31", "foo"),
+            ("2014-10-02 10:20:31", "foo"),
+            ("2014-10-05 10:20:31", "foo"),
+            ("2014-10-06 10:20:31", "foo"),
+            ("2014-10-08 10:20:31", "foo"),
+            ("2014-10-09 10:20:31", "foo"),
+            ("2014-10-10 10:20:31", "foo"),
+            ("2014-10-11 10:20:31", "foo"),
+            ("2014-10-20 10:20:31", "foo"),
+            ("2014-10-22 10:20:31", "foo"),
+            ("2014-11-08 10:20:31", "foo"),
+            ("2014-11-10 10:20:31", "foo"),
+            ("2014-11-12 10:20:31", "foo"),
+            ("2014-11-13 10:20:31", "foo"),
+            ("2014-11-15 10:20:31", "foo,bar"),
+            ("2015-10-22 10:20:31", "foo,bar"),
+            ("2015-10-22 10:20:31", "foo,bar"),
         ];
 
         let delete_never = ["2014-09-01 10:25:37"];

diff --git a/crates/core/src/commands/prune.rs b/crates/core/src/commands/prune.rs
@@ -1215,9 +1215,8 @@ impl PrunePlan {
         let packs: Vec<_> = self
             .index_files
             .into_iter()
-            .map(|index| {
+            .inspect(|index| {
                 indexes_remove.push(index.id);
-                index
             })
             .flat_map(|index| index.packs)
             .collect();

diff --git a/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily10.snap b/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily10.snap
@@ -51,8 +51,8 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -87,21 +87,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),

diff --git a/...apshots/rustic_core__commands__forget__tests__keep-daily2,keep-weekly2,keep-monthly6.snap b/...apshots/rustic_core__commands__forget__tests__keep-daily2,keep-weekly2,keep-monthly6.snap
@@ -40,10 +40,10 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", true, [
+  ("2015-10-22T10:20:31Z", true, [
     "monthly",
   ]),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -84,21 +84,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),

diff --git a/...core__commands__forget__tests__keep-daily3,keep-weekly2,keep-monthly-1,keep-yearly-1.snap b/...core__commands__forget__tests__keep-daily3,keep-weekly2,keep-monthly-1,keep-yearly-1.snap
@@ -44,10 +44,10 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", true, [
+  ("2015-10-22T10:20:31Z", true, [
     "monthly",
   ]),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -89,23 +89,23 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", true, [
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", true, [
     "monthly",
   ]),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", true, [
     "monthly",
   ]),

diff --git a/...rc/commands/snapshots/rustic_core__commands__forget__tests__keep-daily3,keep-weekly4.snap b/...rc/commands/snapshots/rustic_core__commands__forget__tests__keep-daily3,keep-weekly4.snap
@@ -42,8 +42,8 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -78,21 +78,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),

diff --git a/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily3.snap b/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily3.snap
@@ -37,8 +37,8 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -73,21 +73,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),

diff --git a/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily30.snap b/crates/core/src/commands/snapshots/rustic_core__commands__forget__tests__keep-daily30.snap
@@ -69,10 +69,10 @@ ForgetResult([
   ("2015-11-08T10:20:30Z", true, [
     "daily",
   ]),
-  ("2015-10-22T10:20:30Z", true, [
+  ("2015-10-22T10:20:31Z", true, [
     "daily",
   ]),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", true, [
@@ -127,21 +127,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),

diff --git a/..._core__commands__forget__tests__keep-daily7,keep-weekly2,keep-monthly3,keep-yearly10.snap b/..._core__commands__forget__tests__keep-daily7,keep-weekly2,keep-monthly3,keep-yearly10.snap
@@ -52,10 +52,10 @@ ForgetResult([
   ("2015-11-12T10:20:30Z", false, []),
   ("2015-11-10T10:20:30Z", false, []),
   ("2015-11-08T10:20:30Z", false, []),
-  ("2015-10-22T10:20:30Z", true, [
+  ("2015-10-22T10:20:31Z", true, [
     "monthly",
   ]),
-  ("2015-10-22T10:20:30Z", false, []),
+  ("2015-10-22T10:20:31Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-22T10:20:30Z", false, []),
   ("2015-10-20T10:20:30Z", false, []),
@@ -92,21 +92,21 @@ ForgetResult([
   ("2014-11-21T10:20:30Z", false, []),
   ("2014-11-20T10:20:30Z", false, []),
   ("2014-11-18T10:20:30Z", false, []),
-  ("2014-11-15T10:20:30Z", false, []),
-  ("2014-11-13T10:20:30Z", false, []),
-  ("2014-11-12T10:20:30Z", false, []),
-  ("2014-11-10T10:20:30Z", false, []),
-  ("2014-11-08T10:20:30Z", false, []),
-  ("2014-10-22T10:20:30Z", false, []),
-  ("2014-10-20T10:20:30Z", false, []),
-  ("2014-10-11T10:20:30Z", false, []),
-  ("2014-10-10T10:20:30Z", false, []),
-  ("2014-10-09T10:20:30Z", false, []),
-  ("2014-10-08T10:20:30Z", false, []),
-  ("2014-10-06T10:20:30Z", false, []),
-  ("2014-10-05T10:20:30Z", false, []),
-  ("2014-10-02T10:20:30Z", false, []),
-  ("2014-10-01T10:20:30Z", false, []),
+  ("2014-11-15T10:20:31Z", false, []),
+  ("2014-11-13T10:20:31Z", false, []),
+  ("2014-11-12T10:20:31Z", false, []),
+  ("2014-11-10T10:20:31Z", false, []),
+  ("2014-11-08T10:20:31Z", false, []),
+  ("2014-10-22T10:20:31Z", false, []),
+  ("2014-10-20T10:20:31Z", false, []),
+  ("2014-10-11T10:20:31Z", false, []),
+  ("2014-10-10T10:20:31Z", false, []),
+  ("2014-10-09T10:20:31Z", false, []),
+  ("2014-10-08T10:20:31Z", false, []),
+  ("2014-10-06T10:20:31Z", false, []),
+  ("2014-10-05T10:20:31Z", false, []),
+  ("2014-10-02T10:20:31Z", false, []),
+  ("2014-10-01T10:20:31Z", false, []),
   ("2014-09-22T10:20:30Z", false, []),
   ("2014-09-20T10:20:30Z", false, []),
   ("2014-09-11T10:20:30Z", false, []),