use prettyplease to format

Author: Emilgardis

ci/svd2rust-regress/Cargo.toml

@@ -13,3 +13,5 @@ anyhow = "1"
 thiserror = "1"
 serde = "1"
 serde_json = "1"
+prettyplease = "0.2"
+syn = "2"

ci/svd2rust-regress/src/main.rs

@@ -182,11 +182,11 @@ impl Tests {
                 }
             }
         });
-        Ok(if any_fails.load(Ordering::Acquire) {
+        if any_fails.load(Ordering::Acquire) {
             exit(1);
         } else {
             exit(0);
-        })
+        }
     }
 }
 

ci/svd2rust-regress/src/svd_test.rs

@@ -247,6 +247,16 @@ impl TestCase {
             }
             _ => {}
         }
+        let lib_rs =
+            fs::read_to_string(&lib_rs_file).with_context(|| "Failed to read lib.rs file")?;
+        let file = syn::parse_file(&lib_rs)
+            .with_context(|| format!("couldn't parse {}", lib_rs_file.display()))?;
+        File::options()
+            .write(true)
+            .open(&lib_rs_file)
+            .with_context(|| format!("couldn't open {}", lib_rs_file.display()))?
+            .write(prettyplease::unparse(&file).as_bytes())
+            .with_context(|| format!("couldn't write {}", lib_rs_file.display()))?;
         let rustfmt_err_file = path_helper_base(&chip_dir, &["rustfmt.err.log"]);
         if let Some(rustfmt_bin_path) = rustfmt_bin_path {
             // Run `cargo fmt`, capturing stderr to a log file

src/generate/peripheral.rs

@@ -245,20 +245,15 @@ pub fn render(p_original: &Peripheral, index: &Index, config: &Config) -> Result
 
 /// An enum describing the derivation status of an erc, which allows for disjoint arrays to be
 /// implicitly derived from a common type.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Default)]
 enum DeriveInfo {
+    #[default]
     Root,
     Explicit(RegisterPath),
     Implicit(RegisterPath),
     Cluster, // don't do anything different for clusters
 }
 
-impl Default for DeriveInfo {
-    fn default() -> Self {
-        DeriveInfo::Root
-    }
-}
-
 impl fmt::Display for DeriveInfo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{self:?}")