Skip to content

Commit 2e6bb46

Browse files
committed
simplify
1 parent f0406ca commit 2e6bb46

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

svd-rs/src/enumeratedvalue.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,9 @@ impl EnumeratedValue {
141141
if lvl.is_strict() {
142142
super::check_name(&self.name, "name")?;
143143
}
144-
match (&self.value, &self.is_default) {
145-
(None, None) | (None, Some(false)) => Err(Error::AbsentValue.into()),
146-
(Some(_), Some(true)) if lvl.is_strict() => {
147-
Err(Error::ValueAndDefault(self.value).into())
148-
}
144+
match (self.value.is_some(), self.is_default()) {
145+
(false, false) => Err(Error::AbsentValue.into()),
146+
(true, true) if lvl.is_strict() => Err(Error::ValueAndDefault(self.value).into()),
149147
_ => Ok(()),
150148
}
151149
}

svd-rs/src/enumeratedvalues.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl EnumeratedValues {
103103
/// Return default value if present
104104
pub fn default_value(&self) -> Option<&EnumeratedValue> {
105105
for v in &self.values {
106-
if let Some(true) = v.is_default {
106+
if v.is_default() {
107107
return Some(v);
108108
}
109109
}

0 commit comments

Comments
 (0)