From 295c8503806795391b3158ae711357259b3e6679 Mon Sep 17 00:00:00 2001 From: Gwen Lg Date: Wed, 29 Oct 2025 00:51:48 +0100 Subject: [PATCH] chore: add taplo.toml and resave Cargo.toml Signed-off-by: Gwen Lg --- Cargo.toml | 6 +++--- src/api/admin/Cargo.toml | 4 ++-- src/api/k2v/Cargo.toml | 4 ++-- src/block/Cargo.toml | 2 +- src/db/Cargo.toml | 10 +++++----- src/garage/Cargo.toml | 30 +++++++++++++++++------------- src/k2v-client/Cargo.toml | 5 ++++- src/model/Cargo.toml | 10 +++++----- src/rpc/Cargo.toml | 6 +++--- taplo.toml | 7 +++++++ 10 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 taplo.toml diff --git a/Cargo.toml b/Cargo.toml index 337cdd8c..7e4a3f64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,7 +95,7 @@ fjall = "2.4" async-compression = { version = "0.4", features = ["tokio", "zstd"] } zstd = { version = "0.13", default-features = false } -quick-xml = { version = "0.26", features = [ "serialize" ] } +quick-xml = { version = "0.26", features = ["serialize"] } rmp-serde = "1.1.2" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_bytes = "0.11" @@ -115,7 +115,7 @@ httpdate = "1.0" http-range = "0.1" http-body-util = "0.1" hyper = { version = "1.0", default-features = false } -hyper-util = { version = "0.1", features = [ "full" ] } +hyper-util = { version = "0.1", features = ["full"] } multer = "3.0" percent-encoding = "2.2" roxmltree = "0.19" @@ -127,7 +127,7 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi tokio-util = { version = "0.7", features = ["compat", "io"] } tokio-stream = { version = "0.1", features = ["net"] } -opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] } +opentelemetry = { version = "0.17", features = ["rt-tokio", "metrics", "trace"] } opentelemetry-prometheus = "0.10" opentelemetry-otlp = "0.10" opentelemetry-contrib = "0.9" diff --git a/src/api/admin/Cargo.toml b/src/api/admin/Cargo.toml index 8736059a..c8bc3423 100644 --- a/src/api/admin/Cargo.toml +++ b/src/api/admin/Cargo.toml @@ -46,5 +46,5 @@ opentelemetry-prometheus = { workspace = true, optional = true } prometheus = { workspace = true, optional = true } [features] -metrics = [ "opentelemetry-prometheus", "prometheus" ] -k2v = [ "garage_model/k2v" ] +metrics = ["opentelemetry-prometheus", "prometheus"] +k2v = ["garage_model/k2v"] diff --git a/src/api/k2v/Cargo.toml b/src/api/k2v/Cargo.toml index 62f71d35..d99c3411 100644 --- a/src/api/k2v/Cargo.toml +++ b/src/api/k2v/Cargo.toml @@ -14,9 +14,9 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_model = { workspace = true, features = [ "k2v" ] } +garage_model = { workspace = true, features = ["k2v"] } garage_table.workspace = true -garage_util = { workspace = true, features = [ "k2v" ] } +garage_util = { workspace = true, features = ["k2v"] } garage_api_common.workspace = true base64.workspace = true diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index 785ea771..b45898a2 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -39,4 +39,4 @@ tokio.workspace = true tokio-util.workspace = true [features] -system-libs = [ "zstd/pkg-config" ] +system-libs = ["zstd/pkg-config"] diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index ab21097f..40134169 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -28,8 +28,8 @@ parking_lot = { workspace = true, optional = true } mktemp.workspace = true [features] -default = [ "lmdb", "sqlite" ] -bundled-libs = [ "rusqlite?/bundled" ] -lmdb = [ "heed" ] -fjall = [ "dep:fjall", "dep:parking_lot" ] -sqlite = [ "rusqlite", "r2d2", "r2d2_sqlite" ] +default = ["lmdb", "sqlite"] +bundled-libs = ["rusqlite?/bundled"] +lmdb = ["heed"] +fjall = ["dep:fjall", "dep:parking_lot"] +sqlite = ["rusqlite", "r2d2", "r2d2_sqlite"] diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index bda9d5e8..8b726a86 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -86,32 +86,36 @@ k2v-client.workspace = true [features] -default = [ "bundled-libs", "metrics", "lmdb", "sqlite", "k2v" ] +default = ["bundled-libs", "metrics", "lmdb", "sqlite", "k2v"] -k2v = [ "garage_util/k2v", "garage_api_k2v", "garage_api_admin/k2v" ] +k2v = ["garage_util/k2v", "garage_api_k2v", "garage_api_admin/k2v"] # Database engines -lmdb = [ "garage_model/lmdb" ] -sqlite = [ "garage_model/sqlite" ] -fjall = [ "garage_model/fjall" ] +lmdb = ["garage_model/lmdb"] +sqlite = ["garage_model/sqlite"] +fjall = ["garage_model/fjall"] # Automatic registration and discovery via Consul API -consul-discovery = [ "garage_rpc/consul-discovery" ] +consul-discovery = ["garage_rpc/consul-discovery"] # Automatic registration and discovery via Kubernetes API -kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ] +kubernetes-discovery = ["garage_rpc/kubernetes-discovery"] # Prometheus exporter (/metrics endpoint). -metrics = [ "garage_api_admin/metrics", "opentelemetry-prometheus" ] +metrics = ["garage_api_admin/metrics", "opentelemetry-prometheus"] # Exporter for the OpenTelemetry Collector. -telemetry-otlp = [ "opentelemetry-otlp" ] +telemetry-otlp = ["opentelemetry-otlp"] # Logging to syslog -syslog = [ "syslog-tracing" ] +syslog = ["syslog-tracing"] # Logging to journald -journald = [ "tracing-journald" ] +journald = ["tracing-journald"] # NOTE: bundled-libs and system-libs should be treat as mutually exclusive; # exactly one of them should be enabled. # Use bundled libsqlite instead of linking against system-provided. -bundled-libs = [ "garage_db/bundled-libs" ] +bundled-libs = ["garage_db/bundled-libs"] # Link against system-provided libsodium and libzstd. -system-libs = [ "garage_block/system-libs", "garage_rpc/system-libs", "sodiumoxide/use-pkg-config" ] +system-libs = [ + "garage_block/system-libs", + "garage_rpc/system-libs", + "sodiumoxide/use-pkg-config", +] diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index bbd09b19..ccbc7aa3 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "k2v-client" version = "0.0.4" -authors = ["Trinity Pointard ", "Alex Auvolat "] +authors = [ + "Trinity Pointard ", + "Alex Auvolat ", +] edition = "2018" license = "AGPL-3.0" description = "Client library for the Garage K2V protocol" diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index f822d4a0..0f8d040c 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -41,8 +41,8 @@ futures.workspace = true tokio.workspace = true [features] -default = [ "lmdb", "sqlite" ] -k2v = [ "garage_util/k2v" ] -lmdb = [ "garage_db/lmdb" ] -sqlite = [ "garage_db/sqlite" ] -fjall = [ "garage_db/fjall" ] +default = ["lmdb", "sqlite"] +k2v = ["garage_util/k2v"] +lmdb = ["garage_db/lmdb"] +sqlite = ["garage_db/sqlite"] +fjall = ["garage_db/fjall"] diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 57dab4ca..1c35dcd9 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -48,6 +48,6 @@ tokio.workspace = true opentelemetry.workspace = true [features] -kubernetes-discovery = [ "kube", "k8s-openapi", "schemars" ] -consul-discovery = [ "reqwest", "thiserror" ] -system-libs = [ "sodiumoxide/use-pkg-config" ] +kubernetes-discovery = ["kube", "k8s-openapi", "schemars"] +consul-discovery = ["reqwest", "thiserror"] +system-libs = ["sodiumoxide/use-pkg-config"] diff --git a/taplo.toml b/taplo.toml new file mode 100644 index 00000000..05486ef4 --- /dev/null +++ b/taplo.toml @@ -0,0 +1,7 @@ +include = ["**/Cargo.toml", "taplo.toml"] + +[formatting] +indent_string = " " +compact_inline_tables = false +compact_arrays = true +inline_table_expand = false