Update merge to 0.2.0 in bitbuffer_derive.

The old merge 0.1.0 used proc-macro-error, which is unmaintained.
Fixes RUSTSEC-2024-0370 warning.

Cargo.lock

@@ -32,7 +32,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -67,9 +67,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "merge"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
+checksum = "56e520ba58faea3487f75df198b1d079644ec226ea3b0507d002c6fa4b8cf93a"
 dependencies = [
  "merge_derive",
  "num-traits",
@@ -77,14 +77,14 @@ dependencies = [
 
 [[package]]
 name = "merge_derive"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
+checksum = "5c8f8ce6efff81cbc83caf4af0905c46e58cb46892f63ad3835e81b47eaf7968"
 dependencies = [
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -97,27 +97,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro-error"
+name = "proc-macro-error-attr2"
-version = "1.0.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
 dependencies = [
- "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
- "version_check",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
+name = "proc-macro-error2"
-version = "1.0.4"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
 dependencies = [
+ "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "version_check",
+ "syn",
 ]
 
 [[package]]
@@ -165,7 +163,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -185,7 +183,7 @@ checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -196,7 +194,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -220,7 +218,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -231,18 +229,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.98",
+ "syn",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
 ]
 
 [[package]]
@@ -273,7 +260,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.98",
+ "syn",
 ]
 
 [[package]]
@@ -281,9 +268,3 @@ name = "unicode-ident"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

bitbuffer_derive/Cargo.toml

@@ -16,7 +16,7 @@ syn = { version = "2.0.98", features = ["extra-traits"] }
 quote = "1.0.38"
 proc-macro2 = "1.0.93"
 structmeta = "0.3.0"
-merge = "0.1.0"
+merge = "0.2.0"
 
 [dev-dependencies]
 bitbuffer = { version = "0.11", path = ".." }

bitbuffer_derive/src/params/enum.rs

@@ -8,6 +8,7 @@ use syn::{Attribute, DataEnum, Error, LitInt, Result};
 
 #[derive(Default, StructMeta, Merge, Debug)]
 struct EnumAttrs {
+    #[merge(strategy = merge::option::overwrite_none)]
     discriminant_bits: Option<LitInt>,
 }
 

bitbuffer_derive/src/params/field.rs

@@ -7,7 +7,9 @@ use syn::{Expr, Field, Index, LitInt, Member, Result, Type};
 
 #[derive(Default, StructMeta, Merge)]
 struct FieldAttrs {
+    #[merge(strategy = merge::option::overwrite_none)]
     size: Option<Expr>,
+    #[merge(strategy = merge::option::overwrite_none)]
     size_bits: Option<LitInt>,
     #[merge(strategy = merge::bool::overwrite_false)]
     align: bool,

bitbuffer_derive/src/params/mod.rs

@@ -141,6 +141,7 @@ impl ToTokens for Alignment {
 
 #[derive(Default, StructMeta, Merge, Debug)]
 struct InputAttrs {
+    #[merge(strategy = merge::option::overwrite_none)]
     endianness: Option<LitStr>,
     #[merge(strategy = merge::bool::overwrite_false)]
     align: bool,

bitbuffer_derive/src/params/variant.rs

@@ -11,10 +11,13 @@ use syn::{Expr, ExprLit, Fields, Lit, LitInt, Result, Variant};
 
 #[derive(Default, StructMeta, Merge)]
 struct VariantAttrs {
+    #[merge(strategy = merge::option::overwrite_none)]
     size: Option<Expr>,
+    #[merge(strategy = merge::option::overwrite_none)]
     size_bits: Option<LitInt>,
     #[merge(strategy = merge::bool::overwrite_false)]
     align: bool,
+    #[merge(strategy = merge::option::overwrite_none)]
     discriminant: Option<Lit>,
 }