From bdddbdf52f370d8a5b470459c6f0637f2ec6deda Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 17 Mar 2025 10:15:48 -0400 Subject: [PATCH] taplo: reorder-keys This reduces manual work, but produces some odd ordering such as crate names not being the first attribute in their manifests. --- .taplo.toml | 1 + Cargo.toml | 6 +++--- aya-build/Cargo.toml | 10 +++++----- aya-ebpf-macros/Cargo.toml | 10 +++++----- aya-log-common/Cargo.toml | 12 ++++++------ aya-log-ebpf-macros/Cargo.toml | 10 +++++----- aya-log-parser/Cargo.toml | 10 +++++----- aya-log/Cargo.toml | 14 +++++++------- aya-obj/Cargo.toml | 14 +++++++------- aya-tool/Cargo.toml | 16 ++++++++-------- aya/Cargo.toml | 18 +++++++++--------- ebpf/aya-ebpf-bindings/Cargo.toml | 10 +++++----- ebpf/aya-ebpf-cty/Cargo.toml | 10 +++++----- ebpf/aya-ebpf/Cargo.toml | 12 ++++++------ ebpf/aya-log-ebpf/Cargo.toml | 10 +++++----- init/Cargo.toml | 10 +++++----- netlify.toml | 2 +- release.toml | 2 +- test/integration-common/Cargo.toml | 10 +++++----- test/integration-ebpf/Cargo.toml | 10 +++++----- test/integration-test/Cargo.toml | 10 +++++----- xtask/Cargo.toml | 10 +++++----- 22 files changed, 109 insertions(+), 108 deletions(-) diff --git a/.taplo.toml b/.taplo.toml index d8a04c55..fffb7cba 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -2,3 +2,4 @@ [rule.formatting] indent_string = " " +reorder_keys = true diff --git a/Cargo.toml b/Cargo.toml index e56bdd42..d3e4f644 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,11 +49,11 @@ default-members = [ [workspace.package] authors = ["Aya Contributors"] +edition = "2024" +homepage = "https://aya-rs.dev" license = "MIT OR Apache-2.0" repository = "https://github.com/aya-rs/aya" -homepage = "https://aya-rs.dev" rust-version = "1.85.0" -edition = "2024" # 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 @@ -107,8 +107,8 @@ xdpilone = { version = "1.0.5", default-features = false } unused-extern-crates = "warn" [profile.release.package.integration-ebpf] -debug = 2 codegen-units = 1 +debug = 2 [patch.crates-io] # TODO: Remove when https://github.com/rust-random/getrandom/commit/b75db5cede302bc9734f5bf2b9048a6e05c7f11e appears in a release. diff --git a/aya-build/Cargo.toml b/aya-build/Cargo.toml index 888a6cfa..a2fdae84 100644 --- a/aya-build/Cargo.toml +++ b/aya-build/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "aya-build" -version = "0.1.2" -description = "Build-time support for aya projects" authors.workspace = true +description = "Build-time support for aya projects" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-build" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.2" [lints] workspace = true diff --git a/aya-ebpf-macros/Cargo.toml b/aya-ebpf-macros/Cargo.toml index 67299202..7e12b7a6 100644 --- a/aya-ebpf-macros/Cargo.toml +++ b/aya-ebpf-macros/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "aya-ebpf-macros" -version = "0.1.1" -description = "Proc macros used by aya-ebpf" authors.workspace = true +description = "Proc macros used by aya-ebpf" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-ebpf-macros" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.1" [lints] workspace = true diff --git a/aya-log-common/Cargo.toml b/aya-log-common/Cargo.toml index cc4a78a5..f82a1d34 100644 --- a/aya-log-common/Cargo.toml +++ b/aya-log-common/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "aya-log-common" -version = "0.1.15" +authors.workspace = true description = "A logging library for eBPF programs." -keywords = ["bpf", "ebpf", "log", "logging"] documentation = "https://docs.rs/aya-log" -authors.workspace = true +edition.workspace = true +homepage.workspace = true +keywords = ["bpf", "ebpf", "log", "logging"] license.workspace = true +name = "aya-log-common" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.15" [lints] workspace = true diff --git a/aya-log-ebpf-macros/Cargo.toml b/aya-log-ebpf-macros/Cargo.toml index 4fae2a2f..75892898 100644 --- a/aya-log-ebpf-macros/Cargo.toml +++ b/aya-log-ebpf-macros/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "aya-log-ebpf-macros" -version = "0.1.0" -description = "Proc macros used by aya-log-ebpf" authors.workspace = true +description = "Proc macros used by aya-log-ebpf" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-log-ebpf-macros" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true diff --git a/aya-log-parser/Cargo.toml b/aya-log-parser/Cargo.toml index 76cd5926..9f7e9eb3 100644 --- a/aya-log-parser/Cargo.toml +++ b/aya-log-parser/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "aya-log-parser" -version = "0.1.13" -description = "A parser for the aya log format strings" authors.workspace = true +description = "A parser for the aya log format strings" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-log-parser" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.13" [lints] workspace = true diff --git a/aya-log/Cargo.toml b/aya-log/Cargo.toml index 5bd81c5a..e3111e22 100644 --- a/aya-log/Cargo.toml +++ b/aya-log/Cargo.toml @@ -1,16 +1,16 @@ [package] -name = "aya-log" -version = "0.2.1" +authors.workspace = true description = "A logging library for eBPF programs." -keywords = ["bpf", "ebpf", "log", "logging"] -readme = "README.md" documentation = "https://docs.rs/aya-log" -authors.workspace = true +edition.workspace = true +homepage.workspace = true +keywords = ["bpf", "ebpf", "log", "logging"] license.workspace = true +name = "aya-log" +readme = "README.md" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.2.1" [lints] workspace = true diff --git a/aya-obj/Cargo.toml b/aya-obj/Cargo.toml index 8eb757f7..64ba1204 100644 --- a/aya-obj/Cargo.toml +++ b/aya-obj/Cargo.toml @@ -1,16 +1,16 @@ [package] -name = "aya-obj" -version = "0.2.1" +authors.workspace = true description = "An eBPF object file parsing library with BTF and relocation support." -keywords = ["bpf", "btf", "ebpf", "elf", "object"] -readme = "README.md" documentation = "https://docs.rs/aya-obj" -authors.workspace = true +edition.workspace = true +homepage.workspace = true +keywords = ["bpf", "btf", "ebpf", "elf", "object"] license.workspace = true +name = "aya-obj" +readme = "README.md" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.2.1" [lints] workspace = true diff --git a/aya-tool/Cargo.toml b/aya-tool/Cargo.toml index 578bc4b8..cedb35b8 100644 --- a/aya-tool/Cargo.toml +++ b/aya-tool/Cargo.toml @@ -1,21 +1,21 @@ [package] -name = "aya-tool" -version = "0.1.0" -publish = false -description = "A tool for generating bindings for Linux Kernel types" authors.workspace = true +description = "A tool for generating bindings for Linux Kernel types" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-tool" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true [dependencies] +anyhow = { workspace = true, default-features = true } bindgen = { workspace = true, default-features = true } clap = { workspace = true, default-features = true, features = ["derive"] } -anyhow = { workspace = true, default-features = true } -thiserror = { workspace = true } tempfile = { workspace = true } +thiserror = { workspace = true } diff --git a/aya/Cargo.toml b/aya/Cargo.toml index ff7087db..715f4010 100644 --- a/aya/Cargo.toml +++ b/aya/Cargo.toml @@ -1,16 +1,16 @@ [package] -name = "aya" -version = "0.13.1" +authors.workspace = true description = "An eBPF library with a focus on developer experience and operability." -keywords = ["bpf", "ebpf", "kernel", "linux"] -readme = "README.md" documentation = "https://docs.rs/aya" -authors.workspace = true +edition.workspace = true +homepage.workspace = true +keywords = ["bpf", "ebpf", "kernel", "linux"] license.workspace = true +name = "aya" +readme = "README.md" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.13.1" [lints] workspace = true @@ -33,9 +33,9 @@ tokio = { workspace = true, features = ["rt"], optional = true } tempfile = { workspace = true } [features] -default = [] -async_tokio = ["tokio/net"] async_std = ["dep:async-io"] +async_tokio = ["tokio/net"] +default = [] [package.metadata.docs.rs] all-features = true diff --git a/ebpf/aya-ebpf-bindings/Cargo.toml b/ebpf/aya-ebpf-bindings/Cargo.toml index e3e42170..7bae485a 100644 --- a/ebpf/aya-ebpf-bindings/Cargo.toml +++ b/ebpf/aya-ebpf-bindings/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "aya-ebpf-bindings" -version = "0.1.1" -description = "Bindings for Linux Kernel eBPF types and helpers" authors.workspace = true +description = "Bindings for Linux Kernel eBPF types and helpers" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-ebpf-bindings" repository.workspace = true -homepage.workspace = true -edition.workspace = true +version = "0.1.1" [lints] workspace = true diff --git a/ebpf/aya-ebpf-cty/Cargo.toml b/ebpf/aya-ebpf-cty/Cargo.toml index fb13b1e6..c5829e25 100644 --- a/ebpf/aya-ebpf-cty/Cargo.toml +++ b/ebpf/aya-ebpf-cty/Cargo.toml @@ -1,15 +1,15 @@ [package] +authors.workspace = true categories = ["embedded", "external-ffi-bindings", "no-std"] description = "Type aliases to C types like c_int for use with bindgen" documentation = "https://docs.rs/aya-bpf-cty" -name = "aya-ebpf-cty" -version = "0.2.2" -authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-ebpf-cty" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.2.2" [lints] workspace = true diff --git a/ebpf/aya-ebpf/Cargo.toml b/ebpf/aya-ebpf/Cargo.toml index b6c16e38..71445047 100644 --- a/ebpf/aya-ebpf/Cargo.toml +++ b/ebpf/aya-ebpf/Cargo.toml @@ -1,21 +1,21 @@ [package] -name = "aya-ebpf" -version = "0.1.1" -description = "A library for writing eBPF programs" authors.workspace = true +description = "A library for writing eBPF programs" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-ebpf" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.1" [lints] workspace = true [dependencies] +aya-ebpf-bindings = { version = "^0.1.1", path = "../aya-ebpf-bindings" } aya-ebpf-cty = { version = "^0.2.2", path = "../aya-ebpf-cty" } aya-ebpf-macros = { version = "^0.1.1", path = "../../aya-ebpf-macros" } -aya-ebpf-bindings = { version = "^0.1.1", path = "../aya-ebpf-bindings" } [build-dependencies] rustversion = { workspace = true } diff --git a/ebpf/aya-log-ebpf/Cargo.toml b/ebpf/aya-log-ebpf/Cargo.toml index 03e947e1..c69de09f 100644 --- a/ebpf/aya-log-ebpf/Cargo.toml +++ b/ebpf/aya-log-ebpf/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "aya-log-ebpf" -version = "0.1.1" -description = "Logging for eBPF programs" authors.workspace = true +description = "Logging for eBPF programs" +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "aya-log-ebpf" repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.1" [lints] workspace = true diff --git a/init/Cargo.toml b/init/Cargo.toml index 50915cad..f16a0319 100644 --- a/init/Cargo.toml +++ b/init/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "init" -version = "0.1.0" -publish = false authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "init" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true diff --git a/netlify.toml b/netlify.toml index 178413df..1aa9d7b4 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] -publish = "site" command = "rustup toolchain install nightly -c rust-src && cargo xtask docs" +publish = "site" diff --git a/release.toml b/release.toml index fb4d710e..0f941e9c 100644 --- a/release.toml +++ b/release.toml @@ -1,2 +1,2 @@ -pre-release-commit-message = "{{crate_name}}: release version {{version}}" consolidate-commits = true +pre-release-commit-message = "{{crate_name}}: release version {{version}}" diff --git a/test/integration-common/Cargo.toml b/test/integration-common/Cargo.toml index 756fa216..9e04974e 100644 --- a/test/integration-common/Cargo.toml +++ b/test/integration-common/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "integration-common" -version = "0.1.0" -publish = false authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "integration-common" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true diff --git a/test/integration-ebpf/Cargo.toml b/test/integration-ebpf/Cargo.toml index c99e2cef..e0ce6487 100644 --- a/test/integration-ebpf/Cargo.toml +++ b/test/integration-ebpf/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "integration-ebpf" -version = "0.1.0" -publish = false authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "integration-ebpf" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true diff --git a/test/integration-test/Cargo.toml b/test/integration-test/Cargo.toml index 09f73535..3ac416e3 100644 --- a/test/integration-test/Cargo.toml +++ b/test/integration-test/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "integration-test" -version = "0.1.0" -publish = false authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "integration-test" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 25b2945b..5f3af862 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "xtask" -version = "0.1.0" -publish = false authors.workspace = true +edition.workspace = true +homepage.workspace = true license.workspace = true +name = "xtask" +publish = false repository.workspace = true -homepage.workspace = true rust-version.workspace = true -edition.workspace = true +version = "0.1.0" [lints] workspace = true