Skip to content

Commit 592b9f0

Browse files
Emilgardisburrbull
authored andcommitted
satisfy clippy with svd-rs/serde
1 parent e1199e0 commit 592b9f0

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

svd-rs/src/bitrange.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ mod ser_de {
124124
Some(k) if k == "bitRange" => {
125125
let s: String = map.next_value()?;
126126
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"))
128128
}
129129
Some(k) if k == "bitOffset" || k == "bitWidth" => {
130130
let offset;
@@ -133,17 +133,13 @@ mod ser_de {
133133
offset = map.next_value()?;
134134
width = match map.next_key::<&str>()? {
135135
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")),
139137
};
140138
} else {
141139
width = map.next_value()?;
142140
offset = match map.next_key::<&str>()? {
143141
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")),
147143
};
148144
}
149145
Ok(BitRange::from_offset_width(offset, width))
@@ -155,19 +151,19 @@ mod ser_de {
155151
msb = map.next_value()?;
156152
lsb = match map.next_key::<&str>()? {
157153
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")),
159155
};
160156
} else {
161157
lsb = map.next_value()?;
162158
msb = match map.next_key::<&str>()? {
163159
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")),
165161
};
166162
}
167163
Ok(BitRange::from_msb_lsb(msb, lsb))
168164
}
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")),
171167
}
172168
}
173169
}

0 commit comments

Comments
 (0)