some more fixes and tweaks

Author: robamu

.github/workflows/ci.yml

@@ -77,17 +77,17 @@ jobs:
           - { rust: stable, vendor: Nuvoton, options: "-- --atomics" }
           - { rust: stable, vendor: NXP }
           - { rust: stable, vendor: NXP, options: "-- --strict --atomics" }
-          - { rust: stable, vendor: RISC-V }
-          - { rust: stable, vendor: RISC-V, options: "-- --strict --atomics" }
+          - { rust: stable, vendor: SiFive }
+          - { rust: stable, vendor: SiFive, options: "-- --strict --atomics" }
           - { rust: stable, vendor: SiliconLabs, options: "" }
           - { rust: stable, vendor: SiliconLabs, options: "-- --strict --atomics" }
           - { rust: stable, vendor: Spansion }
           - { rust: stable, vendor: Spansion, options: "-- --strict --atomics" }
-          - { rust: stable, vendor: STMico }
-          - { rust: stable, vendor: STMico, options: "-- --atomics" }
-          - { rust: stable, vendor: STMico, options: "-- --strict -f enum_value::p: --max-cluster-size --atomics --atomics-feature atomics --impl-debug --impl-defmt defmt" }
-          - { rust: stable, vendor: Toschiba }
-          - { rust: stable, vendor: Toschiba, options: "-- --strict --atomics" }
+          - { rust: stable, vendor: STMicro }
+          - { rust: stable, vendor: STMicro, options: "-- --atomics" }
+          - { rust: stable, vendor: STMicro, options: "-- --strict -f enum_value::p: --max-cluster-size --atomics --atomics-feature atomics --impl-debug --impl-defmt defmt" }
+          - { rust: stable, vendor: Toshiba }
+          - { rust: stable, vendor: Toshiba, options: "-- --strict --atomics" }
           - { rust: stable, vendor: TexasInstruments }
           - { rust: stable, vendor: TexasInstruments, options: "-- --atomics" }
           - { rust: stable, vendor: Espressif }

ci/svd2rust-regress/src/svd_test.rs

@@ -24,6 +24,7 @@ const CRATES_MIPS: &[&str] = &["mips-mcu = \"0.1.0\""];
 const PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
 const FEATURES_ALL: &[&str] = &["[features]"];
 const FEATURES_CORTEX_M: &[&str] = &["rt = [\"cortex-m-rt/device\"]"];
+const FEATURES_XTENSA_LX: &[&str] = &["rt = []"];
 const WORKSPACE_EXCLUDE: &[&str] = &["[workspace]"];
 
 fn path_helper_base(base: &Path, input: &[&str]) -> PathBuf {
@@ -305,11 +306,8 @@ impl TestCase {
     }
 
     fn prepare_rust_toolchain_file(&self, chip_dir: &Path) -> Result<(), TestError> {
-        let channel = match self.arch {
-            Target::XtensaLX => Some("esp"),
-            Target::Msp430 => Some("nightly-2025-02-02"),
-            _ => None,
-        };
+        // Could be extended to let cargo install and use a specific toolchain.
+        let channel: Option<String> = None;
 
         if let Some(channel) = channel {
             let toolchain_file = path_helper_base(chip_dir, &["rust-toolchain.toml"]);
@@ -349,7 +347,7 @@ impl TestCase {
                 Target::None => unreachable!(),
             })
             .chain(if let Some(opts) = opts {
-                if opts.iter().find(|v| v.contains("atomics")).is_some() {
+                if opts.iter().any(|v| v.contains("atomics")) {
                     CRATES_ATOMICS.iter()
                 } else {
                     [].iter()
@@ -361,6 +359,7 @@ impl TestCase {
             .chain(FEATURES_ALL.iter())
             .chain(match &self.arch {
                 Target::CortexM => FEATURES_CORTEX_M.iter(),
+                Target::XtensaLX => FEATURES_XTENSA_LX.iter(),
                 _ => [].iter(),
             })
             .chain(WORKSPACE_EXCLUDE.iter());