From d4073ea086c45599e42134ce46b49d97d827e2c6 Mon Sep 17 00:00:00 2001 From: eupn Date: Wed, 26 Oct 2022 21:20:33 +0400 Subject: [PATCH] svd2utra: fix clippy lints --- svd2utra/src/generate.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index 701bbd9a9..d2ecdf4d0 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -133,7 +133,7 @@ fn generate_field(reader: &mut Reader) -> Result msb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "bitRange" => { let range = extract_contents(reader)?; - if !range.starts_with("[") || !range.ends_with("]") { + if !range.starts_with('[') || !range.ends_with(']') { return Err(ParseError::UnexpectedValue); } @@ -141,16 +141,16 @@ fn generate_field(reader: &mut Reader) -> Result() - .or_else(|_| Err(ParseError::ParseIntError))?, + .map_err(|_| ParseError::ParseIntError)?, ); lsb = Some( parts .next() - .ok_or_else(|| ParseError::UnexpectedValue)? + .ok_or(ParseError::UnexpectedValue)? .parse::() - .or_else(|_| Err(ParseError::ParseIntError))?, + .map_err(|_| ParseError::ParseIntError)?, ); } _ => (), @@ -351,7 +351,7 @@ fn generate_peripheral( // Derive from the base peripheral if specified if let Some(base_peripheral) = base_peripheral { - return Ok(derive_peripheral(base_peripheral, &name, base)); + Ok(derive_peripheral(base_peripheral, &name, base)) } else { Ok(Peripheral { name, @@ -374,14 +374,12 @@ fn generate_peripherals(reader: &mut Reader) -> Result { let base_peripheral_name = String::from_utf8(value.to_vec()) - .or_else(|_| Err(ParseError::NonUTF8))?; + .map_err(|_| ParseError::NonUTF8)?; let base = peripherals .iter() .find(|p| p.name == base_peripheral_name) - .ok_or_else(|| { - ParseError::MissingBasePeripheral(base_peripheral_name) - })?; + .ok_or(ParseError::MissingBasePeripheral(base_peripheral_name))?; Some(base) }