cleanups

Author: burrbull

src/generate/peripheral.rs

@@ -1114,7 +1114,7 @@ fn name_to_ty_str<'a, 'b>(name: &'a str, ns: Option<&'b str>) -> Cow<'a, str> {
 
 fn name_to_ty(name: &str, ns: Option<&str>) -> Result<syn::Type, syn::Error> {
     let ident = name_to_ty_str(name, ns);
-    Ok(syn::Type::Path(parse_str::<syn::TypePath>(&ident)?))
+    parse_str::<syn::TypePath>(&ident).map(syn::Type::Path)
 }
 
 fn name_to_wrapped_ty_str(name: &str, ns: Option<&str>) -> String {
@@ -1136,14 +1136,8 @@ fn name_to_wrapped_ty_str(name: &str, ns: Option<&str>) -> String {
 
 fn name_to_wrapped_ty(name: &str, ns: Option<&str>) -> Result<syn::Type> {
     let ident = name_to_wrapped_ty_str(name, ns);
-    match parse_str::<syn::TypePath>(&ident) {
-        Ok(path) => Ok(syn::Type::Path(path)),
-        Err(e) => {
-            let mut res = Err(e.into());
-            res = res.with_context(|| {
-                format!("Determining syn::TypePath from ident \"{}\" failed", ident)
-            });
-            res
-        }
-    }
+    parse_str::<syn::TypePath>(&ident)
+        .map(syn::Type::Path)
+        .map_err(anyhow::Error::from)
+        .with_context(|| format!("Determining syn::TypePath from ident \"{}\" failed", ident))
 }

src/util.rs

@@ -1,8 +1,6 @@
 use std::borrow::Cow;
 
-use crate::svd::{
-    Access, Cluster, Device, Field, Register, RegisterCluster, RegisterInfo, RegisterProperties,
-};
+use crate::svd::{Access, Cluster, Device, Field, Register, RegisterInfo, RegisterProperties};
 use inflections::Inflect;
 use proc_macro2::{Ident, Literal, Span, TokenStream};
 use quote::{quote, ToTokens};
@@ -333,7 +331,7 @@ pub fn register_path_to_ty(
     }
     ident.push_str("::");
     ident.push_str(&rpath.name.to_sanitized_snake_case());
-    Ok(syn::Type::Path(parse_str::<syn::TypePath>(&ident)?))
+    parse_str::<syn::TypePath>(&ident).map(syn::Type::Path)
 }
 
 pub trait U32Ext {
@@ -393,42 +391,6 @@ impl U32Ext for u32 {
     }
 }
 
-/// Return the name of either register or cluster.
-pub fn erc_name(erc: &RegisterCluster) -> &String {
-    match erc {
-        RegisterCluster::Register(r) => &r.name,
-        RegisterCluster::Cluster(c) => &c.name,
-    }
-}
-
-/// Return the name of either register or cluster from which this register or cluster is derived.
-pub fn erc_derived_from(erc: &RegisterCluster) -> &Option<String> {
-    match erc {
-        RegisterCluster::Register(r) => &r.derived_from,
-        RegisterCluster::Cluster(c) => &c.derived_from,
-    }
-}
-
-/// Return only the clusters from the slice of either register or clusters.
-pub fn only_clusters(ercs: &[RegisterCluster]) -> Vec<&Cluster> {
-    ercs.iter()
-        .filter_map(|x| match x {
-            RegisterCluster::Cluster(x) => Some(x),
-            _ => None,
-        })
-        .collect()
-}
-
-/// Return only the registers the given slice of either register or clusters.
-pub fn only_registers(ercs: &[RegisterCluster]) -> Vec<&Register> {
-    ercs.iter()
-        .filter_map(|x| match x {
-            RegisterCluster::Register(x) => Some(x),
-            _ => None,
-        })
-        .collect()
-}
-
 pub fn build_rs() -> TokenStream {
     quote! {
         use std::env;