Merge #536

536: Xtensa updates r=adamgreig a=MabezDev

* Switch to bare-metal 1.0.0
* Use xtensa-lx `InterruptNumber` trait
* Update CI script

Co-authored-by: Scott Mabin <[email protected]>

Author: bors[bot]

.github/bors.toml

@@ -15,7 +15,7 @@ status = [
   "ci-linux (stable, Spansion, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, STMicro, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, Toshiba, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (1.40.0, Nordic, x86_64-unknown-linux-gnu, linux)",
+  "ci-linux (1.46.0, Nordic, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, x86_64-apple-darwin, osx)",
   "ci-linux (stable, x86_64-pc-windows-msvc, windows)",
 ]

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
 
         include:
           # Test MSRV
-          - rust: 1.40.0
+          - rust: 1.46.0
             VENDOR: Nordic
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - More Cluster arrays are now emitted as an array rather than a list of
   elements.  An `ArrayProxy` wrapper is used when a Rust built-in array does not
   match the cluster layout.  Requires the `--const_generic` command line option.
+- Bumped `xtensa-lx` and add `xtensa_lx::interrupt::InterruptNumber` implementation.
 
 ## [v0.19.0] - 2021-05-26
 

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.40.0 and up.
+The **generated code** is guaranteed to compile on stable Rust 1.46.0 and up.
 
-If you encounter compilation errors on any stable version newer than 1.40.0, please open an issue.
+If you encounter compilation errors on any stable version newer than 1.46.0, please open an issue.
 
 # Testing Locally
 

ci/script.sh

@@ -590,11 +590,11 @@ main() {
             echo 'version = "1.0.0"' >> $td/Cargo.toml
 
             echo '[dependencies.xtensa-lx]' >> $td/Cargo.toml
-            echo 'version = "0.3.0"' >> $td/Cargo.toml
+            echo 'version = "0.4.0"' >> $td/Cargo.toml
             echo 'features = ["lx6"]' >> $td/Cargo.toml
 
             echo '[dependencies.xtensa-lx-rt]' >> $td/Cargo.toml
-            echo 'version = "0.5.0"' >> $td/Cargo.toml
+            echo 'version = "0.7.0"' >> $td/Cargo.toml
             echo 'features = ["lx6"]' >> $td/Cargo.toml
 
             test_svd_for_target xtensa-lx https://raw.githubusercontent.com/esp-rs/esp32/master/svd/esp32.svd

src/generate/interrupt.rs

@@ -206,34 +206,68 @@ pub fn render(
             }
         };
 
-        if target == Target::CortexM {
-            root.extend(quote! {
-                #interrupt_enum
-
-                unsafe impl cortex_m::interrupt::InterruptNumber for Interrupt {
-                    #[inline(always)]
-                    fn number(#self_token) -> u16 {
-                        #nr_expr
+        match target {
+            Target::CortexM => {
+                root.extend(quote! {
+                    #interrupt_enum
+
+                    unsafe impl cortex_m::interrupt::InterruptNumber for Interrupt {
+                        #[inline(always)]
+                        fn number(#self_token) -> u16 {
+                            #nr_expr
+                        }
+                    }
+                });
+            }
+            Target::XtensaLX => {
+                root.extend(quote! {
+                    #interrupt_enum
+
+                    unsafe impl xtensa_lx::interrupt::InterruptNumber for Interrupt {
+                        #[inline(always)]
+                        fn number(#self_token) -> u16 {
+                            #nr_expr
+                        }
                     }
-                }
-            });
-        } else {
-            mod_items.extend(quote! {
-                #interrupt_enum
 
-                #[derive(Debug, Copy, Clone)]
-                pub struct TryFromInterruptError(());
+                    /// TryFromInterruptError
+                    #[derive(Debug, Copy, Clone)]
+                    pub struct TryFromInterruptError(());
 
-                impl Interrupt {
-                    #[inline]
-                    pub fn try_from(value: u8) -> Result<Self, TryFromInterruptError> {
-                        match value {
-                            #from_arms
-                            _ => Err(TryFromInterruptError(())),
+                    impl Interrupt {
+
+                        /// Attempt to convert a given value into an `Interrupt`
+                        #[inline]
+                        pub fn try_from(value: u16) -> Result<Self, TryFromInterruptError> {
+                            match value {
+                                #from_arms
+                                _ => Err(TryFromInterruptError(())),
+                            }
                         }
                     }
-                }
-            });
+                });
+            }
+            _ => {
+                mod_items.extend(quote! {
+                    #interrupt_enum
+
+                    /// TryFromInterruptError
+                    #[derive(Debug, Copy, Clone)]
+                    pub struct TryFromInterruptError(());
+
+                    impl Interrupt {
+
+                        /// Attempt to convert a given value into an `Interrupt`
+                        #[inline]
+                        pub fn try_from(value: u8) -> Result<Self, TryFromInterruptError> {
+                            match value {
+                                #from_arms
+                                _ => Err(TryFromInterruptError(())),
+                            }
+                        }
+                    }
+                });
+            }
         }
     }
 
@@ -330,7 +364,11 @@ pub fn render(
         }
     }
 
-    if !interrupts.is_empty() && target != Target::CortexM && target != Target::Msp430 {
+    if !interrupts.is_empty()
+        && target != Target::CortexM
+        && target != Target::XtensaLX
+        && target != Target::Msp430
+    {
         root.extend(quote! {
             #[doc(hidden)]
             pub mod interrupt {