Skip to content

Commit

Permalink
chore: Use the cargo workspace package table
Browse files Browse the repository at this point in the history
This allows for inheritance of common fields from the workspace root.
The following fields have been made common:

- authors
- license
- repository
- homepage
- edition

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
  • Loading branch information
dave-tucker committed Feb 22, 2024
1 parent 664bb47 commit b3e7ef7
Show file tree
Hide file tree
Showing 17 changed files with 95 additions and 37 deletions.
7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ default-members = [
# CARGO_CFG_BPF_TARGET_ARCH={x86_64,aarch64,arm,riscv64}
]

[workspace.package]
authors = ["Aya Contributors"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/aya-rs/aya"
homepage = "https://aya-rs.dev"
edition = "2021"

# NOTE(vadorovsky): Neither cargo-udeps nor cargo-machete are able to detect
# unused crates defined in this section. It would be nice to teach either of
# them to do that, but in the meantime we need to be careful.
Expand Down
8 changes: 6 additions & 2 deletions aya-bpf-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "aya-bpf-macros"
version = "0.1.0"
authors = ["Alessandro Decina <alessandro.d@gmail.com>"]
edition = "2021"
description = "Proc macros used by aya-bpf"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[lib]
proc-macro = true
Expand Down
9 changes: 5 additions & 4 deletions aya-log-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ name = "aya-log-common"
version = "0.1.13"
description = "A logging library for eBPF programs."
keywords = ["bpf", "ebpf", "log", "logging"]
license = "MIT OR Apache-2.0"
authors = ["The Aya Contributors"]
repository = "https://github.com/aya-rs/aya-log"
documentation = "https://docs.rs/aya-log"
edition = "2021"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
num_enum = { workspace = true }
Expand Down
7 changes: 6 additions & 1 deletion aya-log-ebpf-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[package]
name = "aya-log-ebpf-macros"
version = "0.1.0"
edition = "2021"
description = "Proc macros used by aya-log-ebpf"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-log-common = { workspace = true }
Expand Down
7 changes: 6 additions & 1 deletion aya-log-parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[package]
name = "aya-log-parser"
version = "0.1.11-dev.0"
edition = "2021"
description = "A parser for the aya log format strings"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-log-common = { workspace = true }
Expand Down
9 changes: 5 additions & 4 deletions aya-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ name = "aya-log"
version = "0.1.13"
description = "A logging library for eBPF programs."
keywords = ["bpf", "ebpf", "log", "logging"]
license = "MIT OR Apache-2.0"
authors = ["The Aya Contributors"]
repository = "https://github.com/aya-rs/aya-log"
readme = "README.md"
documentation = "https://docs.rs/aya-log"
edition = "2021"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya = { workspace = true, features = ["async_tokio"] }
Expand Down
9 changes: 5 additions & 4 deletions aya-obj/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ name = "aya-obj"
version = "0.1.0"
description = "An eBPF object file parsing library with BTF and relocation support."
keywords = ["bpf", "btf", "ebpf", "elf", "object"]
license = "MIT OR Apache-2.0"
authors = ["The Aya Contributors"]
repository = "https://github.com/aya-rs/aya"
readme = "README.md"
documentation = "https://docs.rs/aya-obj"
edition = "2021"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
bytes = { workspace = true }
Expand Down
8 changes: 6 additions & 2 deletions aya-tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "aya-tool"
version = "0.1.0"
authors = ["Alessandro Decina <alessandro.d@gmail.com>"]
edition = "2021"
description = "A tool for generating bindings for Linux Kernel types"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
bindgen = { workspace = true, default-features = true }
Expand Down
9 changes: 5 additions & 4 deletions aya/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ name = "aya"
version = "0.11.0"
description = "An eBPF library with a focus on developer experience and operability."
keywords = ["bpf", "ebpf", "kernel", "linux"]
license = "MIT OR Apache-2.0"
authors = ["The Aya Contributors"]
repository = "https://github.com/aya-rs/aya"
readme = "README.md"
documentation = "https://docs.rs/aya"
edition = "2021"
rust-version = "1.66"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
assert_matches = { workspace = true }
Expand Down
8 changes: 6 additions & 2 deletions bpf/aya-bpf-bindings/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "aya-bpf-bindings"
version = "0.1.0"
authors = ["Alessandro Decina <alessandro.d@gmail.com>"]
edition = "2021"
description = "Bindings for Linux Kernel eBPF types and helpers"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-bpf-cty = { path = "../aya-bpf-cty" }
10 changes: 6 additions & 4 deletions bpf/aya-bpf-cty/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[package]
authors = ["Jorge Aparicio <jorge@japaric.io>"]
edition = "2021"
categories = ["embedded", "external-ffi-bindings", "no-std"]
description = "Type aliases to C types like c_int for use with bindgen"
documentation = "https://docs.rs/cty"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/aya-bpf-cty"
name = "aya-bpf-cty"
version = "0.2.1"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
8 changes: 6 additions & 2 deletions bpf/aya-bpf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "aya-bpf"
version = "0.1.0"
authors = ["Alessandro Decina <alessandro.d@gmail.com>"]
edition = "2021"
description = "A library for writing eBPF programs"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-bpf-cty = { path = "../aya-bpf-cty" }
Expand Down
7 changes: 6 additions & 1 deletion bpf/aya-log-ebpf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[package]
name = "aya-log-ebpf"
version = "0.1.0"
edition = "2021"
description = "Logging for eBPF programs"
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-bpf = { path = "../aya-bpf" }
Expand Down
7 changes: 5 additions & 2 deletions init/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "init"
version = "0.1.0"
authors = ["Tamir Duberstein <tamird@gmail.com>"]
edition = "2021"
publish = false
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
anyhow = { workspace = true, features = ["std"] }
Expand Down
6 changes: 5 additions & 1 deletion test/integration-ebpf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "integration-ebpf"
version = "0.1.0"
edition = "2021"
publish = false
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
aya-bpf = { path = "../../bpf/aya-bpf" }
Expand Down
6 changes: 5 additions & 1 deletion test/integration-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "integration-test"
version = "0.1.0"
edition = "2021"
publish = false
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
anyhow = { workspace = true, features = ["std"] }
Expand Down
7 changes: 5 additions & 2 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "xtask"
version = "0.1.0"
authors = ["Alessandro Decina <alessandro.d@gmail.com>"]
edition = "2021"
publish = false
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true

[dependencies]
anyhow = { workspace = true, features = ["std"] }
Expand Down

0 comments on commit b3e7ef7

Please sign in to comment.