@@ -83,22 +83,31 @@ mod ser_de {
83
83
84
84
#[ derive( serde:: Serialize , serde:: Deserialize ) ]
85
85
#[ serde( untagged) ]
86
- #[ allow( non_snake_case) ]
87
86
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
+ } ,
91
100
}
92
101
93
102
impl From < BitRange > for SerBitRange {
94
103
fn from ( br : BitRange ) -> Self {
95
104
match br. range_type {
96
105
BitRangeType :: BitRange => SerBitRange :: BitRange {
97
- bitRange : br. bit_range ( ) ,
106
+ bit_range : br. bit_range ( ) ,
98
107
} ,
99
108
BitRangeType :: OffsetWidth => SerBitRange :: OffsetWidth {
100
- bitOffset : br. offset ,
101
- bitWidth : br. width ,
109
+ bit_offset : br. offset ,
110
+ bit_width : br. width ,
102
111
} ,
103
112
BitRangeType :: MsbLsb => SerBitRange :: MsbLsb {
104
113
msb : br. msb ( ) ,
@@ -124,12 +133,12 @@ mod ser_de {
124
133
D : Deserializer < ' de > ,
125
134
{
126
135
match SerBitRange :: deserialize ( deserializer) ? {
127
- SerBitRange :: BitRange { bitRange } => BitRange :: from_bit_range ( & bitRange )
136
+ SerBitRange :: BitRange { bit_range } => BitRange :: from_bit_range ( & bit_range )
128
137
. ok_or_else ( || serde:: de:: Error :: custom ( "Can't parse bitRange" ) ) ,
129
138
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 ) ) ,
133
142
SerBitRange :: MsbLsb { msb, lsb } => Ok ( BitRange :: from_msb_lsb ( msb, lsb) ) ,
134
143
}
135
144
}
0 commit comments