@@ -124,7 +124,7 @@ mod ser_de {
124
124
Some ( k) if k == "bitRange" => {
125
125
let s: String = map. next_value ( ) ?;
126
126
BitRange :: from_bit_range ( & s)
127
- . ok_or_else ( || serde:: de:: Error :: custom ( & format ! ( "Can't parse bitRange" ) ) )
127
+ . ok_or_else ( || serde:: de:: Error :: custom ( "Can't parse bitRange" ) )
128
128
}
129
129
Some ( k) if k == "bitOffset" || k == "bitWidth" => {
130
130
let offset;
@@ -133,17 +133,13 @@ mod ser_de {
133
133
offset = map. next_value ( ) ?;
134
134
width = match map. next_key :: < & str > ( ) ? {
135
135
Some ( k) if k == "bitWidth" => map. next_value ( ) ?,
136
- _ => {
137
- return Err ( serde:: de:: Error :: custom ( & format ! ( "Missing bitWidth" ) ) )
138
- }
136
+ _ => return Err ( serde:: de:: Error :: custom ( "Missing bitWidth" ) ) ,
139
137
} ;
140
138
} else {
141
139
width = map. next_value ( ) ?;
142
140
offset = match map. next_key :: < & str > ( ) ? {
143
141
Some ( k) if k == "bitOffset" => map. next_value ( ) ?,
144
- _ => {
145
- return Err ( serde:: de:: Error :: custom ( & format ! ( "Missing bitOffset" ) ) )
146
- }
142
+ _ => return Err ( serde:: de:: Error :: custom ( "Missing bitOffset" ) ) ,
147
143
} ;
148
144
}
149
145
Ok ( BitRange :: from_offset_width ( offset, width) )
@@ -155,19 +151,19 @@ mod ser_de {
155
151
msb = map. next_value ( ) ?;
156
152
lsb = match map. next_key :: < & str > ( ) ? {
157
153
Some ( k) if k == "lsb" => map. next_value ( ) ?,
158
- _ => return Err ( serde:: de:: Error :: custom ( & format ! ( "Missing lsb" ) ) ) ,
154
+ _ => return Err ( serde:: de:: Error :: custom ( "Missing lsb" ) ) ,
159
155
} ;
160
156
} else {
161
157
lsb = map. next_value ( ) ?;
162
158
msb = match map. next_key :: < & str > ( ) ? {
163
159
Some ( k) if k == "msb" => map. next_value ( ) ?,
164
- _ => return Err ( serde:: de:: Error :: custom ( & format ! ( "Missing msb" ) ) ) ,
160
+ _ => return Err ( serde:: de:: Error :: custom ( "Missing msb" ) ) ,
165
161
} ;
166
162
}
167
163
Ok ( BitRange :: from_msb_lsb ( msb, lsb) )
168
164
}
169
- Some ( k) => Err ( serde:: de:: Error :: custom ( & format ! ( "Invalid key: {}" , k) ) ) ,
170
- None => Err ( serde:: de:: Error :: custom ( & format ! ( "Missing bitRange" ) ) ) ,
165
+ Some ( k) => Err ( serde:: de:: Error :: custom ( format ! ( "Invalid key: {}" , k) ) ) ,
166
+ None => Err ( serde:: de:: Error :: custom ( "Missing bitRange" ) ) ,
171
167
}
172
168
}
173
169
}
0 commit comments