Merge pull request #95 from eldruin/switch-to-ghmq

Switch to GHMQ

Author: eldruin

.github/bors.toml

@@ -1,7 +1,9 @@
 on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
+  push: # Run CI for all branches except GitHub merge queue tmp branches
+    branches-ignore:
+    - "gh-readonly-queue/**"
+  pull_request: # Run CI for PRs on any branch
+  merge_group: # Run CI for the GitHub merge queue
 
 name: Continuous integration
 
@@ -13,37 +15,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # All generated code should be running on stable now
         rust: [stable]
-
-        # The default target we're compiling on and for
-        TARGET: [x86_64-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
+        target: [x86_64-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
+        features:
+          - ''
+          - 'async-tokio,gpio_cdev,gpio_sysfs,i2c,spi'
 
         include:
-          # Test MSRV
-          - rust: 1.60.0
-            TARGET: x86_64-unknown-linux-gnu
+          - rust: 1.60.0 # MSRV
+            target: x86_64-unknown-linux-gnu
 
           # Test nightly but don't fail
           - rust: nightly
             experimental: true
-            TARGET: x86_64-unknown-linux-gnu
+            target: x86_64-unknown-linux-gnu
 
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.TARGET }}
-          override: true
+          target: ${{ matrix.target }}
 
       - name: Install armv7 libraries
-        if: ${{ matrix.TARGET == 'armv7-unknown-linux-gnueabihf' }}
+        if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
         run: sudo apt-get install -y libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf
 
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --target=${{ matrix.TARGET }}
+      - run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}

.github/workflows/ci.yml

@@ -1,20 +1,18 @@
 on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
+  push: # Run CI for all branches except GitHub merge queue tmp branches
+    branches-ignore:
+    - "gh-readonly-queue/**"
+  pull_request: # Run CI for PRs on any branch
+  merge_group: # Run CI for the GitHub merge queue
 
 name: Clippy check
 jobs:
   clippy_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
-          override: true
           components: clippy
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - run: cargo clippy --all-features -- --deny=warnings

.github/workflows/clippy.yml

@@ -1,23 +1,19 @@
 on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
+  push: # Run CI for all branches except GitHub merge queue tmp branches
+    branches-ignore:
+    - "gh-readonly-queue/**"
+  pull_request: # Run CI for PRs on any branch
+  merge_group: # Run CI for the GitHub merge queue
 
 name: Code formatting check
 
 jobs:
   fmt:
-    name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
+          toolchain: nightly
           components: rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --check

.github/workflows/rustfmt.yml

@@ -83,10 +83,8 @@ impl std::error::Error for SerialError {}
 impl embedded_hal::serial::Error for SerialError {
     fn kind(&self) -> embedded_hal::serial::ErrorKind {
         use embedded_hal::serial::ErrorKind::*;
-        match &self.err {
-            // TODO: match any errors here if we can find any that are relevant
-            _ => Other,
-        }
+        // TODO: match any errors here if we can find any that are relevant
+        Other
     }
 }
 

src/serial.rs

@@ -165,10 +165,8 @@ impl From<io::Error> for SPIError {
 impl embedded_hal::spi::Error for SPIError {
     fn kind(&self) -> embedded_hal::spi::ErrorKind {
         use embedded_hal::spi::ErrorKind;
-        match self.err.kind() {
-            // TODO: match any errors here if we can find any that are relevant
-            _ => ErrorKind::Other,
-        }
+        // TODO: match any errors here if we can find any that are relevant
+        ErrorKind::Other
     }
 }