robin/bitbuffer
1
0
Fork 0
mirror of https://codeberg.org/icewind/bitbuffer.git synced 2026-06-03 16:44:06 +02:00
Code Issues Releases Wiki Activity

Update merge to 0.2.0 in bitbuffer_derive.

Browse source 
The old merge 0.1.0 used proc-macro-error, which is unmaintained.
Fixes RUSTSEC-2024-0370 warning.
This commit is contained in:
Ondřej Soukeník 2025-07-09 09:53:34 +02:00
commit 5390c96e94
6 changed files with 29 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bitbuffer_derive/src/params/enum.rs
View file

@ -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>,
}

2
bitbuffer_derive/src/params/field.rs
View file

@ -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,

1
bitbuffer_derive/src/params/mod.rs
View file

@ -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,

3
bitbuffer_derive/src/params/variant.rs
View file

@ -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>,
}