Skip to content

Commit f330f84

Browse files
committed
clippy
1 parent 5d80c8f commit f330f84

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/html/html_cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ fn parse_register(
245245
filling |= bit_mask;
246246

247247
let faccs = ftag.access.map(Access::as_str).unwrap_or(raccs);
248-
let enums = ftag.enumerated_values.get(0);
248+
let enums = ftag.enumerated_values.first();
249249
let wc = &ftag.write_constraint;
250250
let mut fdoc = None;
251251
if enums.is_some() || wc.is_some() || faccs == "read-only" {

src/patch/mod.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ fn make_dim_element(h: &Hash) -> Result<Option<DimElementBuilder>> {
337337
}
338338
Some(v)
339339
}
340-
_ => return Err(DimIndexParse).map_err(Into::into),
340+
_ => return Err(DimIndexParse.into()),
341341
}
342342
} else {
343343
None
@@ -652,7 +652,7 @@ fn common_description(descs: &[Option<&str>], dim_index: &[String]) -> Option<Op
652652
for (d, idx) in descs.iter().zip(dim_index).skip(1) {
653653
if d != &dsc
654654
.as_ref()
655-
.map(|desc| desc.replacen("%s", idx, 1))
655+
.map(|dsc| dsc.replacen("%s", idx, 1))
656656
.as_deref()
657657
{
658658
same = false;
@@ -668,15 +668,11 @@ fn common_description(descs: &[Option<&str>], dim_index: &[String]) -> Option<Op
668668
// If descriptions are identical, do not change.
669669
let desc0 = &descs[0];
670670
let mut same = true;
671-
for d in descs.iter().skip(1) {
671+
for d in &descs[1..] {
672672
if d != desc0 {
673673
same = false;
674674
break;
675675
}
676676
}
677-
if same {
678-
Some(desc0.map(Into::into))
679-
} else {
680-
None
681-
}
677+
same.then(|| desc0.map(Into::into))
682678
}

0 commit comments

Comments
 (0)