Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raise bindgen version #2278

Merged
merged 5 commits into from
Aug 17, 2024
Merged

Raise bindgen version #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff1ce6d
bindgen 0.66
alex Aug 17, 2024
ea204f5
Raise MSRV to 1.63
alex Aug 17, 2024
de7d1dc
bindgen 0.68
alex Aug 17, 2024
0f8ac0f
bindgen 0.69
alex Aug 17, 2024
8141d07
Switch to 2021 edition
alex Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
# Remember to also update `--rust-target` in `openssl-sys/build/run_bindgen.rs`
- uses: sfackler/actions/rustup@master
with:
version: 1.56.0
version: 1.63.0
- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
id: rust-version
- uses: actions/cache@v4
Expand All @@ -72,8 +72,6 @@ jobs:
restore-keys: |
index-${{ runner.os }}-
- run: cargo generate-lockfile
- run: |
cargo update -p cc --precise 1.0.94
- uses: actions/cache@v4
with:
path: ~/.cargo/registry/cache
Expand Down
3 changes: 2 additions & 1 deletion openssl-errors/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
name = "openssl-errors"
version = "0.2.0"
authors = ["Steven Fackler <[email protected]>"]
edition = "2018"
edition = "2021"
license = "MIT OR Apache-2.0"
description = "Custom error library support for the openssl crate."
repository = "https://github.com/sfackler/rust-openssl"
readme = "README.md"
categories = ["api-bindings"]
rust-version = "1.63.0"

[dependencies]
cfg-if = "1.0"
Expand Down
3 changes: 2 additions & 1 deletion openssl-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "openssl-macros"
version = "0.1.1"
edition = "2018"
edition = "2021"
license = "MIT OR Apache-2.0"
description = "Internal macros used by the openssl crate."
repository = "https://github.com/sfackler/rust-openssl"
rust-version = "1.63.0"

[lib]
proc-macro = true
Expand Down
5 changes: 3 additions & 2 deletions openssl-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ readme = "README.md"
categories = ["cryptography", "external-ffi-bindings"]
links = "openssl"
build = "build/main.rs"
edition = "2018"
edition = "2021"
rust-version = "1.63.0"

[features]
vendored = ['openssl-src']
Expand All @@ -23,7 +24,7 @@ libc = "0.2"
bssl-sys = { version = "0.1.0", optional = true }

[build-dependencies]
bindgen = { version = "0.65.0", optional = true, features = ["experimental"] }
bindgen = { version = "0.69.0", optional = true, features = ["experimental"] }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need the experimental feature?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, not static-fns are not yet non-experimental. (I'll file a ticket about that if there's not one).

cc = "1.0.61"
openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] }
pkg-config = "0.3.9"
Expand Down
3 changes: 2 additions & 1 deletion openssl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ repository = "https://github.com/sfackler/rust-openssl"
readme = "README.md"
keywords = ["crypto", "tls", "ssl", "dtls"]
categories = ["cryptography", "api-bindings"]
edition = "2018"
edition = "2021"
rust-version = "1.63.0"

# these are deprecated and don't do anything anymore
[features]
Expand Down