Skip to content

Some updates to the cargo manifests #2981

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

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Some updates to the cargo manifests #2981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f8a2b9
Use workspace inheritance for dependencies
pvdrz Nov 19, 2024
cb19a35
Set edition for `bindgen-integration`
pvdrz Nov 19, 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
8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ default-members = [
"bindgen-tests",
]

# Dependencies shared between crates
[workspace.dependencies]
clap = { version = "4", features = ["derive"] }
clap_complete = "4"
shlex = "1"
syn = "2.0"
proc-macro2 = { version = "1", default-features = false }

# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
Expand Down
9 changes: 5 additions & 4 deletions bindgen-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ name = "bindgen"

[dependencies]
bindgen = { path = "../bindgen", version = "=0.70.1", default-features = false, features = ["__cli", "experimental", "prettyplease"] }
clap = { version = "4", features = ["derive"] }
clap_complete = "4"
env_logger = { version = "0.10.0", optional = true }
log = { version = "0.4", optional = true }
proc-macro2 = { version = "1", default-features = false }
shlex = "1"

clap.workspace = true
clap_complete.workspace = true
proc-macro2.workspace = true
shlex.workspace = true

[features]
default = ["logging", "runtime"]
Expand Down
1 change: 1 addition & 0 deletions bindgen-integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description = "A package to test various bindgen features"
version = "0.1.0"
authors = ["Emilio Cobos Álvarez <[email protected]>"]
publish = false
edition = "2018"
build = "build.rs"

[build-dependencies]
Expand Down
15 changes: 8 additions & 7 deletions bindgen-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ publish = false

[dev-dependencies]
bindgen = { path = "../bindgen", features = ["__cli", "experimental"] }
clap = { version = "4", features = ["derive"] }
clap_complete = "4"
shlex = "1"
owo-colors = "3.5.0"
prettyplease = { version = "0.2.7", features = ["verbatim"] }
proc-macro2 = { version = "1", default-features = false }
syn = { version = "2.0" }
tempfile = "3"
similar = { version = "2.2.1", features = ["inline"] }
owo-colors = "3.5.0"
tempfile = "3"

clap.workspace = true
clap_complete.workspace = true
proc-macro2.workspace = true
shlex.workspace = true
syn.workspace = true

[features]
logging = ["bindgen/logging"]
Expand Down
7 changes: 4 additions & 3 deletions bindgen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ clang-sys = { version = "1", features = ["clang_11_0"] }
itertools = { version = ">=0.10,<0.14", default-features = false }
log = { version = "0.4", optional = true }
prettyplease = { version = "0.2.7", optional = true, features = ["verbatim"] }
proc-macro2 = { version = "1", default-features = false }
quote = { version = "1", default-features = false }
regex = { version = "1.5.3", default-features = false, features = ["std", "unicode-perl"] }
rustc-hash = "1.0.1"
shlex = "1"
syn = { version = "2.0", features = ["full", "extra-traits", "visit-mut"] }

proc-macro2.workspace = true
shlex.workspace = true
syn = { workspace = true, features = ["full", "extra-traits", "visit-mut"] }

[features]
default = ["logging", "prettyplease", "runtime"]
Expand Down
Loading