strings

rust-embedded · Oct 19, 2024 · c13b87d · c13b87d
1 parent dbd8734
commit c13b87d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/generate/interrupt.rs b/src/generate/interrupt.rs
@@ -62,10 +62,10 @@ pub fn render(
             interrupt
                 .0
                 .description
-                .as_ref()
-                .map(|s| util::respace(s))
-                .as_ref()
-                .map(|s| util::escape_special_chars(s))
+                .as_deref()
+                .map(util::respace)
+                .as_deref()
+                .map(util::escape_special_chars)
                 .unwrap_or_else(|| interrupt.0.name.clone())
         );
 

diff --git a/src/generate/peripheral.rs b/src/generate/peripheral.rs
@@ -305,7 +305,7 @@ impl Region {
         let mut idents: Vec<_> = self
             .rbfs
             .iter()
-            .filter_map(|f| f.syn_field.ident.as_ref().map(|ident| ident.to_string()))
+            .filter_map(|f| f.syn_field.ident.as_ref().map(ToString::to_string))
             .collect();
         if idents.is_empty() {
             return None;
@@ -343,7 +343,7 @@ impl Region {
         let idents: Vec<_> = self
             .rbfs
             .iter()
-            .filter_map(|f| f.syn_field.ident.as_ref().map(|ident| ident.to_string()))
+            .filter_map(|f| f.syn_field.ident.as_ref().map(ToString::to_string))
             .collect();
 
         if idents.is_empty() {
@@ -726,7 +726,7 @@ fn check_erc_derive_infos(
                 };
                 match register {
                     Register::Single(_) => {
-                        let ty_name = info_name.to_string();
+                        let ty_name = info_name.clone();
                         *derive_info = match explicit_rpath {
                             None => {
                                 match compare_this_against_prev(
@@ -758,7 +758,7 @@ fn check_erc_derive_infos(
                         let re = Regex::new(format!("^{re_string}$").as_str()).map_err(|_| {
                             anyhow!("Error creating regex for register {}", register.name)
                         })?;
-                        let ty_name = info_name.to_string(); // keep suffix for regex matching
+                        let ty_name = info_name.clone(); // keep suffix for regex matching
                         *derive_info = match explicit_rpath {
                             None => {
                                 match compare_this_against_prev(
@@ -787,7 +787,7 @@ fn check_erc_derive_infos(
             }
             RegisterCluster::Cluster(cluster) => {
                 *derive_info = DeriveInfo::Cluster;
-                ercs_type_info.push((cluster.name.to_string(), None, erc, derive_info));
+                ercs_type_info.push((cluster.name.clone(), None, erc, derive_info));
             }
         };
     }

diff --git a/src/generate/register.rs b/src/generate/register.rs
@@ -222,7 +222,7 @@ fn api_docs(
             let idx = format!("[{idx}]");
             rpath.name.replace("[%s]", &idx).replace("%s", &idx)
         } else {
-            rpath.name.to_string()
+            rpath.name.clone()
         };
         // TODO: support html_urls for registers in cluster
         if rpath.block.path.is_empty() {