cleanup

Author: burrbull

Cargo.toml

@@ -73,4 +73,4 @@ features = ["full","extra-traits"]
 [workspace]
 members = ["ci/svd2rust-regress"]
 default-members = ["."]
-exclude = ["output"]
+exclude = ["output"]

ci/svd2rust-regress/src/diff.rs

@@ -158,16 +158,15 @@ impl Diffing {
             .collect::<Vec<_>>();
         if tests.len() != 1 {
             let error = anyhow::anyhow!("diff requires exactly one test case");
-            if tests.is_empty() {
-                return Err(error.context("matched no tests"));
-            } else if tests.len() > 10 {
-                return Err(error.context(format!("matched multiple ({}) tests", tests.len())));
-            }
-            return Err(error.context(format!(
-                "matched multiple ({}) tests\n{:?}",
-                tests.len(),
-                tests.iter().map(|t| t.name()).collect::<Vec<_>>()
-            )));
+            let len = tests.len();
+            return Err(match len {
+                0 => error.context("matched no tests"),
+                10.. => error.context(format!("matched multiple ({len}) tests")),
+                _ => error.context(format!(
+                    "matched multiple ({len}) tests\n{:?}",
+                    tests.iter().map(|t| t.name()).collect::<Vec<_>>()
+                )),
+            });
         }
 
         let baseline = tests[0]

ci/svd2rust-regress/src/svd_test.rs

@@ -245,9 +245,10 @@ impl TestCase {
             true,
             "svd2rust",
             Some(&lib_rs_file).filter(|_| {
-                (self.arch != Target::CortexM)
-                    && (self.arch != Target::Msp430)
-                    && (self.arch != Target::XtensaLX)
+                !matches!(
+                    self.arch,
+                    Target::CortexM | Target::Msp430 | Target::XtensaLX
+                )
             }),
             Some(&svd2rust_err_file),
             &[],

ci/svd2rust-regress/src/tests.rs

@@ -55,6 +55,7 @@ impl std::fmt::Display for Manufacturer {
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub enum RunWhen {
     Always,
     NotShort,
@@ -68,6 +69,7 @@ pub struct TestCase {
     pub arch: Target,
     pub mfgr: Manufacturer,
     pub chip: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     svd_url: Option<String>,
     pub should_pass: bool,
     run_when: RunWhen,