Merge pull request #299 from rustic-rs/dependabot/cargo/serde_with-2.1.0

build(deps): bump serde_with from 2.0.1 to 2.1.0

Cargo.lock

@@ -1889,9 +1889,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7"
+checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
 dependencies = [
  "base64",
  "chrono",
@@ -1905,9 +1905,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93"
+checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
 dependencies = [
  "darling",
  "proc-macro2",

Cargo.toml

@@ -52,7 +52,6 @@ serde-aux = "4"
 # other dependencies
 bytes = "1"
 chrono = { version = "0.4", default_features = false, features = ["clock", "serde"] }
-
 zstd = "0.11"
 enum-map = "2"
 enum-map-derive = "0.10"
@@ -76,7 +75,7 @@ clap_complete = "3.2.4"
 directories = "4"
 toml = "0.5"
 merge = "0.1"
-serde_with = "2"
+serde_with = "2.1"
 rpassword = "7"
 prettytable-rs = {version = "0.9", default-features = false }
 bytesize = "1"

src/backend/node.rs

@@ -45,31 +45,23 @@ pub enum NodeType {
     Socket,
 }
 
+#[serde_with::apply(
+    Option => #[serde(default, skip_serializing_if = "Option::is_none")],
+    u64 => #[serde(default, skip_serializing_if = "is_default")],
+)]
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Getters)]
 pub struct Metadata {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub mode: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub mtime: Option<DateTime<Local>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub atime: Option<DateTime<Local>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub ctime: Option<DateTime<Local>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub uid: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub gid: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub user: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub group: Option<String>,
-    #[serde(default, skip_serializing_if = "is_default")]
     pub inode: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
     pub device_id: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
     pub size: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
     pub links: u64,
 }
 

src/repo/configfile.rs

@@ -5,30 +5,21 @@ use crate::backend::{FileType, RepoFile};
 use crate::blob::BlobType;
 use crate::id::Id;
 
+#[serde_with::apply(Option => #[serde(default, skip_serializing_if = "Option::is_none")])]
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ConfigFile {
     pub version: u32,
     pub id: Id,
     pub chunker_polynomial: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub is_hot: Option<bool>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub compression: Option<i32>, // note that Some(0) means no compression.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub treepack_size: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub treepack_growfactor: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub treepack_size_limit: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub datapack_size: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub datapack_growfactor: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub datapack_size_limit: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub min_packsize_tolerate_percent: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub max_packsize_tolerate_percent: Option<u32>,
 }
 

src/repo/keyfile.rs

@@ -8,13 +8,11 @@ use crate::backend::{FileType, ReadBackend};
 use crate::crypto::{CryptoKey, Key};
 use crate::id::Id;
 
+#[serde_with::apply(Option => #[serde(default, skip_serializing_if = "Option::is_none")])]
 #[derive(Debug, Serialize, Deserialize)]
 pub struct KeyFile {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     hostname: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     username: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     created: Option<DateTime<Local>>,
     kdf: String,
     #[serde(rename = "N")]

src/repo/snapshotfile.rs

@@ -63,12 +63,12 @@ impl DeleteOption {
     }
 }
 
+#[serde_with::apply(Option => #[serde(default, skip_serializing_if = "Option::is_none")])]
 #[derive(Debug, Clone, Serialize, Deserialize, Derivative)]
 #[derivative(Default)]
 pub struct SnapshotFile {
     #[derivative(Default(value = "Local::now()"))]
     pub time: DateTime<Local>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub parent: Option<Id>,
     pub tree: Id,
     pub paths: StringList,
@@ -82,12 +82,10 @@ pub struct SnapshotFile {
     pub gid: u32,
     #[serde(default)]
     pub tags: StringList,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub original: Option<Id>,
     #[serde(default, skip_serializing_if = "DeleteOption::is_not_set")]
     pub delete: DeleteOption,
 
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub summary: Option<SnapshotSummary>,
 
     #[serde(default, skip_serializing_if = "Id::is_null")]
@@ -354,13 +352,11 @@ impl FromStr for SnapshotGroupCriterion {
     }
 }
 
+#[serde_with::apply(Option => #[serde(default, skip_serializing_if = "Option::is_none")])]
 #[derive(Default, Debug, Serialize)]
 pub struct SnapshotGroup {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     hostname: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     paths: Option<StringList>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     tags: Option<StringList>,
 }