Bump toolchain to 1.78.0, support LXD 6

Author: Patryk27

Cargo.lock

@@ -9,15 +9,15 @@ edition = "2021"
 anyhow = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.0", features = ["derive"] }
-colored = "2.0"
+colored = "2.1"
 humantime = "2.1"
-indexmap = { version = "1.9", features = ["serde-1"] }
-itertools = "0.10"
+indexmap = { version = "2.3", features = ["serde"] }
+itertools = "0.13"
 pathsearch = "0.2"
-prettytable-rs = "0.9"
+prettytable-rs = "0.10"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_with = "2.3"
+serde_with = "3.9"
 serde_yaml = "0.9"
 thiserror = "1.0"
 

Cargo.toml

@@ -10,12 +10,12 @@ built-in `snapshots.schedule`, but more powerful.
 
 # Requirements
 
-- LXD 4 / 5
+- LXD 4 / 5 / 6
 - Linux (x86_64)
 
 Plus, if you plan on building lxd-snapper locally:
 
-- Cargo & Rust 1.63.0
+- Cargo & Rust 1.78.0
 - Nix (for running integration tests)
 
 # Getting started
@@ -40,7 +40,7 @@ $ cd lxd-snapper
 $ cargo build --release
 $ ./target/release/lxd-snapper
 
-# (or) Using Nix v3
+# (or) Using Nix
 $ nix build
 $ ./result/bin/lxd-snapper
 ```

README.md

@@ -10,12 +10,35 @@
       url = "github:nixos/nixpkgs/nixos-unstable";
     };
 
+    # nixpkgs containing LXD 4, used for testing purposes
+    nixpkgs--lxd-4 = {
+      url = "github:nixos/nixpkgs/d1c3fea7ecbed758168787fe4e4a3157e52bc808";
+    };
+
+    # nixpkgs containing LXD 5, used for testing purposes
+    nixpkgs--lxd-5 = {
+      url = "github:nixos/nixpkgs/ee01de29d2f58d56b1be4ae24c24bd91c5380cea";
+    };
+
+    # nixpkgs containing LXD 6, used for testing purposes
+    nixpkgs--lxd-6 = {
+      url = "github:nixos/nixpkgs/4802ed07225c42ec290c86800ccf668807763567";
+    };
+
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
     };
   };
 
-  outputs = { self, naersk, nixpkgs, rust-overlay }:
+  outputs =
+    { self
+    , naersk
+    , nixpkgs
+    , nixpkgs--lxd-4
+    , nixpkgs--lxd-5
+    , nixpkgs--lxd-6
+    , rust-overlay
+    }:
     let
       mkPackage = { system, target, RUSTFLAGS }:
         let
@@ -58,7 +81,11 @@
 
       mkCheck = { system }:
         import ./tests.nix {
-          inherit nixpkgs;
+          inherit
+            nixpkgs
+            nixpkgs--lxd-4
+            nixpkgs--lxd-5
+            nixpkgs--lxd-6;
 
           lxd-snapper = self.packages."${system}".default;
         };

flake.lock

@@ -1 +1 @@
-1.63.0
+1.78.0

flake.nix

@@ -117,7 +117,7 @@ mod tests {
             +=========+===========+=====================+
             | default | mysql     | running + databases |
             +---------+-----------+---------------------+
-            | default | outlander | <fg=33>NONE</fg>                |
+            | default | outlander | <fg=33>NONE</fg>              |
             +---------+-----------+---------------------+
             | default | redis     | databases           |
             +---------+-----------+---------------------+
@@ -170,7 +170,7 @@ mod tests {
             +----------+---------+----------+-------------------+
             | server-b | default | php      | important-servers |
             +----------+---------+----------+-------------------+
-            | server-c | default | php      | <fg=33>NONE</fg>              |
+            | server-c | default | php      | <fg=33>NONE</fg>            |
             +----------+---------+----------+-------------------+
             "#,
             stdout

rust-toolchain

@@ -115,8 +115,7 @@ mod tests {
         fn examples() {
             let examples: Vec<_> = glob::glob("docs/example-configs/*.yaml")
                 .unwrap()
-                .into_iter()
-                .map(|example| example.unwrap())
+                .map(|path| path.unwrap())
                 .collect();
 
             if examples.is_empty() {

src/commands/debug_list_instances.rs

@@ -17,7 +17,7 @@ impl<'a> Environment<'a> {
         use chrono::TimeZone;
 
         Self {
-            time: || Utc.timestamp(0, 0),
+            time: || Utc.timestamp_opt(0, 0).unwrap(),
             stdout,
             config,
             lxd,

src/config.rs

@@ -10,7 +10,7 @@ mod testing;
 mod prelude {
     pub(crate) use crate::utils::*;
     pub(crate) use crate::{config::*, environment::*, lxd::*};
-    pub use anyhow::{bail, Context, Error, Result};
+    pub use anyhow::{bail, Context, Result};
     pub use chrono::{DateTime, Utc};
     pub use colored::Colorize;
     pub use itertools::Itertools;