Skip to content

Commit e38ccb2

Browse files
committed
snake case in BitRange serialize helper
1 parent a6734bc commit e38ccb2

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

svd-rs/src/bitrange.rs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,31 @@ mod ser_de {
8383

8484
#[derive(serde::Serialize, serde::Deserialize)]
8585
#[serde(untagged)]
86-
#[allow(non_snake_case)]
8786
enum SerBitRange {
88-
BitRange { bitRange: String },
89-
OffsetWidth { bitOffset: u32, bitWidth: u32 },
90-
MsbLsb { lsb: u32, msb: u32 },
87+
#[serde(rename_all = "camelCase")]
88+
BitRange {
89+
bit_range: String,
90+
},
91+
#[serde(rename_all = "camelCase")]
92+
OffsetWidth {
93+
bit_offset: u32,
94+
bit_width: u32,
95+
},
96+
MsbLsb {
97+
lsb: u32,
98+
msb: u32,
99+
},
91100
}
92101

93102
impl From<BitRange> for SerBitRange {
94103
fn from(br: BitRange) -> Self {
95104
match br.range_type {
96105
BitRangeType::BitRange => SerBitRange::BitRange {
97-
bitRange: br.bit_range(),
106+
bit_range: br.bit_range(),
98107
},
99108
BitRangeType::OffsetWidth => SerBitRange::OffsetWidth {
100-
bitOffset: br.offset,
101-
bitWidth: br.width,
109+
bit_offset: br.offset,
110+
bit_width: br.width,
102111
},
103112
BitRangeType::MsbLsb => SerBitRange::MsbLsb {
104113
msb: br.msb(),
@@ -124,12 +133,12 @@ mod ser_de {
124133
D: Deserializer<'de>,
125134
{
126135
match SerBitRange::deserialize(deserializer)? {
127-
SerBitRange::BitRange { bitRange } => BitRange::from_bit_range(&bitRange)
136+
SerBitRange::BitRange { bit_range } => BitRange::from_bit_range(&bit_range)
128137
.ok_or_else(|| serde::de::Error::custom("Can't parse bitRange")),
129138
SerBitRange::OffsetWidth {
130-
bitOffset,
131-
bitWidth,
132-
} => Ok(BitRange::from_offset_width(bitOffset, bitWidth)),
139+
bit_offset,
140+
bit_width,
141+
} => Ok(BitRange::from_offset_width(bit_offset, bit_width)),
133142
SerBitRange::MsbLsb { msb, lsb } => Ok(BitRange::from_msb_lsb(msb, lsb)),
134143
}
135144
}

0 commit comments

Comments
 (0)