Skip to content

Commit e7bc3f0

Browse files
always check list length
Co-authored-by: Ryan Summers <[email protected]>
1 parent f0c2cfe commit e7bc3f0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/device_builder.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,13 @@ impl<'a, B: UsbBus> UsbDeviceBuilder<'a, B> {
165165
);
166166

167167
// do list length check only if user already specify "extra_lang_ids"
168-
if let Some(extra_lang_ids) = self.config.extra_lang_ids {
169-
assert!(
170-
manufacturer_ls.len() == extra_lang_ids.len() + 1,
171-
"The length of \"manufacturer\" list should be one more than \"extra_lang_ids\" list",
172-
)
173-
}
168+
let num_extra_langs = self.config.extra_lang_ids.as_ref().map(|langs| langs.len()).unwrap_or(0);
169+
170+
assert!(
171+
manufacturer_ls.len() == num_extra_langs + 1,
172+
"The length of \"manufacturer\" list should be one more than \"extra_lang_ids\" list",
173+
)
174+
174175

175176
self.config.manufacturer = Some(manufacturer_ls);
176177

0 commit comments

Comments
 (0)