Update cargo-options to 0.7.1

.github/workflows/CI.yml

@@ -32,12 +32,12 @@ jobs:
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
         os: [ubuntu-latest, macos-13, windows-latest]
-        toolchain: [1.63.0, stable, nightly]
+        toolchain: [1.67.0, stable, nightly]
         # Ideally we should also test against 0.9.0, but it is too unusable to test from CI
         zig: [0.10.1, 0.11.0, master]
         exclude:
           # Only test MSRV with zig stable version
-          - toolchain: 1.63.0
+          - toolchain: 1.67.0
             zig: master
     env:
       RUST_BACKTRACE: "1"
@@ -73,7 +73,7 @@ jobs:
             i686-pc-windows-gnu
       - name: Test bindgen
         # skip on MSRV
-        if: matrix.toolchain != '1.63.0'
+        if: matrix.toolchain != '1.67.0'
         shell: bash
         run: |
           set -e
@@ -89,8 +89,6 @@ jobs:
           cargo run zigbuild --target aarch64-apple-darwin
           cargo run zigbuild --target aarch64-apple-darwin --release
       - name: macOS - Test build universal2
-        # skip on 1.63.0 since it requires 1.64.0
-        if: matrix.toolchain != '1.63.0'
         run: cargo run zigbuild --target universal2-apple-darwin
       - name: macOS - Test build with SDKROOT
         if: matrix.os == 'ubuntu-latest'
@@ -104,7 +102,7 @@ jobs:
           cargo run zigbuild --target aarch64-apple-darwin --manifest-path tests/hello-tls/Cargo.toml
           cargo run zigbuild --target aarch64-apple-darwin --manifest-path tests/hello-rustls/Cargo.toml
       - name: macOS - Test build bindgen with SDKROOT
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.toolchain != '1.63.0' }}
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.toolchain != '1.67.0' }}
         env:
           SDK: MacOSX11.3.sdk
         run: cargo run zigbuild --manifest-path tests/zstd-rs/Cargo.toml --features bindgen --target aarch64-apple-darwin

Cargo.toml

@@ -7,15 +7,15 @@ license = "MIT"
 keywords = ["zig", "cargo"]
 readme = "README.md"
 repository = "https://github.com/rust-cross/cargo-zigbuild"
-rust-version = "1.63"
+rust-version = "1.67"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.53"
-cargo-options = "0.6.0"
+cargo-options = "0.7.1"
 cargo_metadata = "0.18.0"
-clap = { version = "4.0.0", features = ["derive", "env", "wrap_help"] }
+clap = { version = "4.3.0", features = ["derive", "env", "wrap_help", "unstable-styles"] }
 dirs = "5.0.0"
 fat-macho = { version = "0.4.6", default-features = false, optional = true }
 fs-err = "2.6.0"

src/bin/cargo-zigbuild.rs

@@ -8,7 +8,12 @@ use clap::Parser;
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Parser)]
-#[command(version, name = "cargo-zigbuild", display_order = 1)]
+#[command(
+    version,
+    name = "cargo-zigbuild",
+    display_order = 1,
+    styles = cargo_options::styles(),
+)]
 pub enum Opt {
     #[command(name = "zigbuild", aliases = &["build", "b"] )]
     Build(Build),