Merge #709

709: clippy fix r=Emilgardis a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
           - { rust: stable, vendor: Toshiba, options: all }
           - { rust: stable, vendor: Toshiba, options: "" }
           # Test MSRV
-          - { rust: 1.61.0, vendor: Nordic, options: "" }
+          - { rust: 1.64.0, vendor: Nordic, options: "" }
           # Use nightly for architectures which don't support stable
           - { rust: nightly, vendor: MSP430, options: "--atomics" }
           - { rust: nightly, vendor: MSP430, options: "" }

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
+
+- Bump MSRV to 1.64
 - Fix dangling implicit derives
 
 ## [v0.28.0] - 2022-12-25

README.md

@@ -13,9 +13,9 @@ This project is developed and maintained by the [Tools team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-The **generated code** is guaranteed to compile on stable Rust 1.61.0 and up.
+The **generated code** is guaranteed to compile on stable Rust 1.64.0 and up.
 
-If you encounter compilation errors on any stable version newer than 1.61.0, please open an issue.
+If you encounter compilation errors on any stable version newer than 1.64.0, please open an issue.
 
 # Testing Locally
 

src/generate/device.rs

@@ -151,12 +151,12 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
     let array_proxy = include_str!("array_proxy.rs");
     if config.generic_mod {
         let mut file = File::create(config.output_dir.join("generic.rs"))?;
-        writeln!(file, "{}", generic_file)?;
+        writeln!(file, "{generic_file}")?;
         if config.atomics {
-            writeln!(file, "\n{}", generic_atomic_file)?;
+            writeln!(file, "\n{generic_atomic_file}")?;
         }
         if config.const_generic {
-            writeln!(file, "{}", array_proxy)?;
+            writeln!(file, "{array_proxy}")?;
         }
 
         if !config.make_mod {

src/generate/interrupt.rs

@@ -115,7 +115,7 @@ pub fn render(
     match target {
         Target::CortexM => {
             for name in &names {
-                writeln!(device_x, "PROVIDE({} = DefaultHandler);", name)?;
+                writeln!(device_x, "PROVIDE({name} = DefaultHandler);")?;
             }
 
             root.extend(quote! {
@@ -141,7 +141,7 @@ pub fn render(
         }
         Target::Msp430 => {
             for name in &names {
-                writeln!(device_x, "PROVIDE({} = DefaultHandler);", name).unwrap();
+                writeln!(device_x, "PROVIDE({name} = DefaultHandler);").unwrap();
             }
 
             root.extend(quote! {
@@ -169,7 +169,7 @@ pub fn render(
         }
         Target::RISCV => {
             for name in &names {
-                writeln!(device_x, "PROVIDE({} = DefaultHandler);", name)?;
+                writeln!(device_x, "PROVIDE({name} = DefaultHandler);")?;
             }
 
             root.extend(quote! {
@@ -194,7 +194,7 @@ pub fn render(
         }
         Target::XtensaLX => {
             for name in &names {
-                writeln!(device_x, "PROVIDE({} = DefaultHandler);", name)?;
+                writeln!(device_x, "PROVIDE({name} = DefaultHandler);")?;
             }
 
             root.extend(quote! {

src/generate/register.rs

@@ -318,7 +318,7 @@ pub fn render_register_mod(
 
     let methods = methods
         .iter()
-        .map(|s| format!("[`{0}`](crate::generic::Reg::{0})", s))
+        .map(|s| format!("[`{s}`](crate::generic::Reg::{s})"))
         .collect::<Vec<_>>();
     let mut doc = format!("{description}\n\nThis register you can {}. See [API](https://docs.rs/svd2rust/#read--modify--write-api).", methods.join(", "));
 

src/main.rs

@@ -223,7 +223,7 @@ fn run() -> Result<()> {
     ]
     .contains(&config.target)
     {
-        writeln!(File::create(path.join("device.x"))?, "{}", device_x)?;
+        writeln!(File::create(path.join("device.x"))?, "{device_x}")?;
         writeln!(File::create(path.join("build.rs"))?, "{}", build_rs())?;
     }