Modernize crate

.github/workflows/ci.yml

@@ -1,7 +1,8 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: [ master ]
   pull_request:
+  merge_group:
 
 name: Continuous integration
 
@@ -14,7 +15,7 @@ jobs:
       matrix:
         rust:
           # MSRV
-          - 1.60.0
+          - "1.70.0"
           - stable
         os: [ubuntu-latest, macos-latest, windows-latest]
         experimental: [false]
@@ -24,54 +25,45 @@ jobs:
             experimental: true
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: llvm-tools-preview
+      - uses: actions/checkout@v4
+      - name: Setup Rust
+        shell: bash
+        run: |
+          rustup toolchain install ${{ matrix.rust }} --profile minimal
+          rustup default ${{ matrix.rust }}
+          rustup component add llvm-tools-preview clippy rustfmt
+          echo "::add-matcher::.github/workflows/rust.json"
+
+      - name: Clippy
+        run: cargo clippy -- -D warnings
+
+      - name: rustfmt
+        run: cargo fmt --all -- --check
 
       - name: Build and install cargo-binutils
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --path . -f
+        run: cargo install --path . -f
 
       - name: Run cargo-nm
-        uses: actions-rs/cargo@v1
-        with:
-          command: nm
-          args: --bin cargo-nm -- --undefined-only
+        run: cargo nm --bin cargo-nm -- --undefined-only
 
       - name: Run cargo-objdump
-        uses: actions-rs/cargo@v1
-        with:
-          command: objdump
-          args: --bin cargo-objdump -- -h
+        run: cargo objdump --bin cargo-objdump -- -h
 
       - name: Run cargo-objcopy (on Linux only)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: objcopy
-          args: --bin cargo-objdump -v -- -O binary objdump.bin
+        run: cargo objcopy --bin cargo-objdump -v -- -O binary objdump.bin
 
       - name: Run cargo-size
-        uses: actions-rs/cargo@v1
-        with:
-          command: size
-          args: --bin cargo-size -v
+        run: cargo size --bin cargo-size -v
 
       - name: Run cargo-strip (on Linux only)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: strip
-          args: --bin cargo-strip -v
+        run: cargo strip --bin cargo-strip -v
+
   conclusion:
     runs-on: ubuntu-latest
     needs: ci
+    if: always()
     steps:
-      - name: Result
-        run: exit 0
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

.github/workflows/release.yml

@@ -19,20 +19,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          target: ${{ matrix.target }}
-          override: true
+      - name: Setup Rust
+        shell: bash
+        run: |
+          rustup toolchain install stable --profile minimal
+          rustup default stable
+          echo "::add-matcher::.github/workflows/rust.json"
       - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-        with:
-          key: ${{ matrix.target }}
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --target ${{ matrix.target }} --release
+        uses: Swatinem/rust-cache@v2
+      - run: cargo build --target ${{ matrix.target }} --release
 
       - name: (Not Windows) Move executables and compress
         if: ${{ matrix.os != 'windows-latest' }}
@@ -73,7 +68,7 @@ jobs:
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - id: changelog-reader
-        uses: mindsers/changelog-reader-action@v2.0.0
+        uses: mindsers/changelog-reader-action@v2.2.2
         with:
           version: ${{ (github.ref_type == 'tag' && github.ref_name) || 'Unreleased' }}
 

.github/workflows/rust.json

@@ -0,0 +1,21 @@
+{
+    "problemMatcher": [
+      {
+        "owner": "rust",
+        "pattern": [
+          {
+            "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
+            "severity": 1,
+            "message": 4,
+            "code": 3
+          },
+          {
+            "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+            "file": 2,
+            "line": 3,
+            "column": 4
+          }
+        ]
+      }
+    ]
+  }

CHANGELOG.md

@@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- MSRV Changed to 1.60
-- Bump `rust-cfg` to 0.5 and `cargo_metadata` to 0.15
+- MSRV Changed to 1.70.0
+- Bump `rust-cfg` to 0.5, `cargo_metadata` to 0.18, `clap` to 4 and `toml` to 0.8
 
 ### Fixed
 

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-edition = "2018"
+edition = "2021"
 authors = [
     "The Embedded WG Tools Team <[email protected]>",
     "Jorge Aparicio <[email protected]>",
@@ -13,14 +13,15 @@ name = "cargo-binutils"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cargo-binutils/"
 version = "0.3.6"
+rust-version = "1.70.0"
 
 [dependencies]
-cargo_metadata = "0.15"
-clap = "2.34"
+cargo_metadata = "0.18.1"
+clap = { version = "4.4.8", features = ["cargo", "wrap_help", "string"] }
 regex = "1.5"
 rustc-cfg = "0.5"
 rustc-demangle = "0.1"
 rustc_version = "0.4"
 serde = "1.0"
-toml = "0.5"
+toml = "0.8.8"
 anyhow = "1.0"

README.md

@@ -209,8 +209,7 @@ linker = "rust-lld"
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
-compile with older versions but that may change in any new patch release.
+This crate is guaranteed to compile on stable Rust 1.70.0 and up.
 
 ## License