Skip to content

Commit

Permalink
Update to clap 4. (#2380)
Browse files Browse the repository at this point in the history
* Update to clap 4.

* Bump MSRV to minimum required by clap 4.

* Mention clap update in CHANGELOG.
  • Loading branch information
qwandor authored Jan 12, 2023
1 parent e6dd2c6 commit ed2d06e
Show file tree
Hide file tree
Showing 8 changed files with 421 additions and 251 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bindgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:
profile: minimal
# MSRV below is documented in Cargo.toml and README.md, please update those if you
# change this.
toolchain: 1.57.0
toolchain: 1.60.0
override: true

- name: Build with msrv
run: rm Cargo.lock && cargo +1.57.0 build --lib
run: rm Cargo.lock && cargo +1.60.0 build --lib

quickchecking:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@
argument instead of a `&str`.
* Updated the `clang-sys` crate version to 1.4.0 to support clang 15.
* The return type is now ommited in signatures of functions returning `void`.

* Updated the `clap` dependency for `bindgen-cli` to 4.

## Removed

## Fixed
Expand Down
169 changes: 134 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern "C" {

## MSRV

The minimum supported Rust version is **1.57.0**.
The minimum supported Rust version is **1.60.0**.

No MSRV bump policy has been established yet, so MSRV may increase in any release.

Expand Down
4 changes: 2 additions & 2 deletions bindgen-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage = "https://rust-lang.github.io/rust-bindgen/"
version = "0.63.0"
edition = "2018"
# If you change this, also update README.md and msrv in .github/workflows/bindgen.yml
rust-version = "1.57.0"
rust-version = "1.60.0"

[[bin]]
path = "main.rs"
Expand All @@ -23,7 +23,7 @@ name = "bindgen"
[dependencies]
bindgen = { path = "../bindgen", version = "=0.63.0" }
shlex = "1"
clap = "3"
clap = "4"
env_logger = { version = "0.9.0", optional = true }
log = { version = "0.4", optional = true }

Expand Down
Loading

0 comments on commit ed2d06e

Please sign in to comment.