Skip to content

Commit 7085250

Browse files
josecelanojosecelano
committed
fix(lint/toml): normalize taplo formatting across workspace
1 parent 0e174af commit 7085250

28 files changed

Lines changed: 156 additions & 160 deletions

File tree

‎.cargo/config.toml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ time = "build --timings --all-targets"
77

88
[build]
99
rustflags = [
10-
"-D",
11-
"warnings",
12-
"-D",
13-
"future-incompatible",
14-
"-D",
15-
"let-underscore",
16-
"-D",
17-
"nonstandard-style",
18-
"-D",
19-
"rust-2018-compatibility",
20-
"-D",
21-
"rust-2018-idioms",
22-
"-D",
23-
"rust-2021-compatibility",
24-
"-D",
25-
"unused",
10+
"-D",
11+
"warnings",
12+
"-D",
13+
"future-incompatible",
14+
"-D",
15+
"let-underscore",
16+
"-D",
17+
"nonstandard-style",
18+
"-D",
19+
"rust-2018-compatibility",
20+
"-D",
21+
"rust-2018-idioms",
22+
"-D",
23+
"rust-2021-compatibility",
24+
"-D",
25+
"unused",
2626
]

‎.taplo.toml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,26 @@
22
# Used by the "Even Better TOML" VS Code extension
33

44
# Exclude generated and runtime folders from linting
5-
exclude = [
6-
"target/**",
7-
"storage/**",
8-
".coverage/**",
9-
]
5+
exclude = [ ".coverage/**", "storage/**", "target/**" ]
106

117
[formatting]
128
# Preserve blank lines that exist
139
allowed_blank_lines = 1
1410
# Don't reorder keys to maintain structure
1511
reorder_keys = false
1612
# Array formatting
17-
array_trailing_comma = true
18-
array_auto_expand = false
1913
array_auto_collapse = false
14+
array_auto_expand = false
15+
array_trailing_comma = true
2016
# Inline table formatting
21-
inline_table_expand = false
22-
compact_inline_tables = false
2317
compact_arrays = false
18+
compact_inline_tables = false
19+
inline_table_expand = false
2420
# Alignment
25-
align_entries = false
2621
align_comments = true
22+
align_entries = false
2723
# Indentation
28-
indent_tables = false
2924
indent_entries = false
25+
indent_tables = false
3026
# Other
3127
trailing_newline = true

‎Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ version.workspace = true
1919
name = "torrust_tracker_lib"
2020

2121
[workspace.package]
22-
authors = ["Nautilus Cyberneering <info@nautilus-cyberneering.de>, Mick van Dijke <mick@dutchbits.nl>"]
23-
categories = ["network-programming", "web-programming"]
22+
authors = [ "Nautilus Cyberneering <info@nautilus-cyberneering.de>, Mick van Dijke <mick@dutchbits.nl>" ]
23+
categories = [ "network-programming", "web-programming" ]
2424
description = "A feature rich BitTorrent tracker."
2525
documentation = "https://docs.rs/crate/torrust-tracker/"
2626
edition = "2021"
2727
homepage = "https://torrust.com/"
28-
keywords = ["bittorrent", "file-sharing", "peer-to-peer", "torrent", "tracker"]
28+
keywords = [ "bittorrent", "file-sharing", "peer-to-peer", "torrent", "tracker" ]
2929
license = "AGPL-3.0-only"
3030
publish = true
3131
repository = "https://github.com/torrust/torrust-tracker"
@@ -34,19 +34,19 @@ version = "3.0.0-develop"
3434

3535
[dependencies]
3636
anyhow = "1"
37-
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
37+
axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
3838
bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "packages/http-tracker-core" }
3939
bittorrent-tracker-core = { version = "3.0.0-develop", path = "packages/tracker-core" }
4040
bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "packages/udp-tracker-core" }
41-
chrono = { version = "0", default-features = false, features = ["clock"] }
42-
clap = { version = "4", features = ["derive", "env"] }
41+
chrono = { version = "0", default-features = false, features = [ "clock" ] }
42+
clap = { version = "4", features = [ "derive", "env" ] }
4343
rand = "0"
4444
regex = "1"
45-
reqwest = { version = "0", features = ["json"] }
46-
serde = { version = "1", features = ["derive"] }
47-
serde_json = { version = "1", features = ["preserve_order"] }
45+
reqwest = { version = "0", features = [ "json" ] }
46+
serde = { version = "1", features = [ "derive" ] }
47+
serde_json = { version = "1", features = [ "preserve_order" ] }
4848
thiserror = "2.0.12"
49-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
49+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
5050
tokio-util = "0.7.15"
5151
torrust-axum-health-check-api-server = { version = "3.0.0-develop", path = "packages/axum-health-check-api-server" }
5252
torrust-axum-http-tracker-server = { version = "3.0.0-develop", path = "packages/axum-http-tracker-server" }
@@ -59,7 +59,7 @@ torrust-tracker-configuration = { version = "3.0.0-develop", path = "packages/co
5959
torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "packages/swarm-coordination-registry" }
6060
torrust-udp-tracker-server = { version = "3.0.0-develop", path = "packages/udp-tracker-server" }
6161
tracing = "0"
62-
tracing-subscriber = { version = "0", features = ["json"] }
62+
tracing-subscriber = { version = "0", features = [ "json" ] }
6363

6464
[dev-dependencies]
6565
bittorrent-primitives = "0.1.0"
@@ -70,7 +70,7 @@ torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "packages/
7070
torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "packages/test-helpers" }
7171

7272
[workspace]
73-
members = ["console/tracker-client", "packages/torrent-repository-benchmarking"]
73+
members = [ "console/tracker-client", "packages/torrent-repository-benchmarking" ]
7474

7575
[profile.dev]
7676
debug = 1

‎console/tracker-client/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
description = "A collection of console clients to make requests to BitTorrent trackers."
3-
keywords = ["bittorrent", "client", "tracker"]
3+
keywords = [ "bittorrent", "client", "tracker" ]
44
license = "LGPL-3.0"
55
name = "torrust-tracker-client"
66
readme = "README.md"
@@ -19,21 +19,21 @@ anyhow = "1"
1919
aquatic_udp_protocol = "0"
2020
bittorrent-primitives = "0.1.0"
2121
bittorrent-tracker-client = { version = "3.0.0-develop", path = "../../packages/tracker-client" }
22-
clap = { version = "4", features = ["derive", "env"] }
22+
clap = { version = "4", features = [ "derive", "env" ] }
2323
futures = "0"
2424
hex-literal = "1"
2525
hyper = "1"
26-
reqwest = { version = "0", features = ["json"] }
27-
serde = { version = "1", features = ["derive"] }
26+
reqwest = { version = "0", features = [ "json" ] }
27+
serde = { version = "1", features = [ "derive" ] }
2828
serde_bencode = "0"
2929
serde_bytes = "0"
30-
serde_json = { version = "1", features = ["preserve_order"] }
30+
serde_json = { version = "1", features = [ "preserve_order" ] }
3131
thiserror = "2"
32-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
32+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
3333
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../../packages/configuration" }
3434
tracing = "0"
35-
tracing-subscriber = { version = "0", features = ["json"] }
36-
url = { version = "2", features = ["serde"] }
35+
tracing-subscriber = { version = "0", features = [ "json" ] }
36+
url = { version = "2", features = [ "serde" ] }
3737

3838
[package.metadata.cargo-machete]
39-
ignored = ["serde_bytes"]
39+
ignored = [ "serde_bytes" ]

‎contrib/bencode/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
22
description = "(contrib) Efficient decoding and encoding for bencode."
3-
keywords = ["bencode", "contrib", "library"]
3+
keywords = [ "bencode", "contrib", "library" ]
44
name = "torrust-tracker-contrib-bencode"
55
readme = "README.md"
66

7-
authors = ["Nautilus Cyberneering <info@nautilus-cyberneering.de>, Andrew <amiller4421@gmail.com>"]
7+
authors = [ "Nautilus Cyberneering <info@nautilus-cyberneering.de>, Andrew <amiller4421@gmail.com>" ]
88
license = "Apache-2.0"
99
repository = "https://github.com/torrust/bittorrent-infrastructure-project"
1010

‎packages/axum-health-check-api-server/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "The Torrust Bittorrent HTTP tracker."
44
documentation.workspace = true
55
edition.workspace = true
66
homepage.workspace = true
7-
keywords = ["axum", "bittorrent", "healthcheck", "http", "server", "torrust", "tracker"]
7+
keywords = [ "axum", "bittorrent", "healthcheck", "http", "server", "torrust", "tracker" ]
88
license.workspace = true
99
name = "torrust-axum-health-check-api-server"
1010
publish.workspace = true
@@ -14,27 +14,27 @@ rust-version.workspace = true
1414
version.workspace = true
1515

1616
[dependencies]
17-
axum = { version = "0", features = ["macros"] }
18-
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
17+
axum = { version = "0", features = [ "macros" ] }
18+
axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
1919
futures = "0"
2020
hyper = "1"
21-
serde = { version = "1", features = ["derive"] }
22-
serde_json = { version = "1", features = ["preserve_order"] }
23-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
21+
serde = { version = "1", features = [ "derive" ] }
22+
serde_json = { version = "1", features = [ "preserve_order" ] }
23+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
2424
torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
2525
torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
2626
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
2727
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
28-
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
28+
tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
2929
tracing = "0"
3030
url = "2.5.4"
3131

3232
[dev-dependencies]
33-
reqwest = { version = "0", features = ["json"] }
33+
reqwest = { version = "0", features = [ "json" ] }
3434
torrust-axum-health-check-api-server = { version = "3.0.0-develop", path = "../axum-health-check-api-server" }
3535
torrust-axum-http-tracker-server = { version = "3.0.0-develop", path = "../axum-http-tracker-server" }
3636
torrust-axum-rest-tracker-api-server = { version = "3.0.0-develop", path = "../axum-rest-tracker-api-server" }
3737
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
3838
torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
3939
torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
40-
tracing-subscriber = { version = "0", features = ["json"] }
40+
tracing-subscriber = { version = "0", features = [ "json" ] }

‎packages/axum-http-tracker-server/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "The Torrust Bittorrent HTTP tracker."
44
documentation.workspace = true
55
edition.workspace = true
66
homepage.workspace = true
7-
keywords = ["axum", "bittorrent", "http", "server", "torrust", "tracker"]
7+
keywords = [ "axum", "bittorrent", "http", "server", "torrust", "tracker" ]
88
license.workspace = true
99
name = "torrust-axum-http-tracker-server"
1010
publish.workspace = true
@@ -15,28 +15,28 @@ version.workspace = true
1515

1616
[dependencies]
1717
aquatic_udp_protocol = "0"
18-
axum = { version = "0", features = ["macros"] }
18+
axum = { version = "0", features = [ "macros" ] }
1919
axum-client-ip = "0"
20-
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
20+
axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
2121
bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-tracker-core" }
2222
bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "../http-protocol" }
2323
bittorrent-primitives = "0.1.0"
2424
bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
25-
derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
25+
derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
2626
futures = "0"
2727
hyper = "1"
28-
reqwest = { version = "0", features = ["json"] }
29-
serde = { version = "1", features = ["derive"] }
30-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
28+
reqwest = { version = "0", features = [ "json" ] }
29+
serde = { version = "1", features = [ "derive" ] }
30+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
3131
tokio-util = "0.7.15"
3232
torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
3333
torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
3434
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
3535
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
3636
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
3737
torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
38-
tower = { version = "0", features = ["timeout"] }
39-
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
38+
tower = { version = "0", features = [ "timeout" ] }
39+
tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
4040
tracing = "0"
4141

4242
[dev-dependencies]
@@ -49,5 +49,5 @@ serde_repr = "0"
4949
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
5050
torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
5151
torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
52-
uuid = { version = "1", features = ["v4"] }
52+
uuid = { version = "1", features = [ "v4" ] }
5353
zerocopy = "0.7"

‎packages/axum-rest-tracker-api-server/Cargo.toml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "The Torrust Tracker API."
44
documentation.workspace = true
55
edition.workspace = true
66
homepage.workspace = true
7-
keywords = ["axum", "bittorrent", "http", "server", "torrust", "tracker"]
7+
keywords = [ "axum", "bittorrent", "http", "server", "torrust", "tracker" ]
88
license.workspace = true
99
name = "torrust-axum-rest-tracker-api-server"
1010
publish.workspace = true
@@ -15,22 +15,22 @@ version.workspace = true
1515

1616
[dependencies]
1717
aquatic_udp_protocol = "0"
18-
axum = { version = "0", features = ["macros"] }
19-
axum-extra = { version = "0", features = ["query"] }
20-
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
18+
axum = { version = "0", features = [ "macros" ] }
19+
axum-extra = { version = "0", features = [ "query" ] }
20+
axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
2121
bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-tracker-core" }
2222
bittorrent-primitives = "0.1.0"
2323
bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
2424
bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "../udp-tracker-core" }
25-
derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
25+
derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
2626
futures = "0"
2727
hyper = "1"
28-
reqwest = { version = "0", features = ["json"] }
29-
serde = { version = "1", features = ["derive"] }
30-
serde_json = { version = "1", features = ["preserve_order"] }
31-
serde_with = { version = "3", features = ["json"] }
28+
reqwest = { version = "0", features = [ "json" ] }
29+
serde = { version = "1", features = [ "derive" ] }
30+
serde_json = { version = "1", features = [ "preserve_order" ] }
31+
serde_with = { version = "3", features = [ "json" ] }
3232
thiserror = "2"
33-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
33+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
3434
torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
3535
torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "../rest-tracker-api-client" }
3636
torrust-rest-tracker-api-core = { version = "3.0.0-develop", path = "../rest-tracker-api-core" }
@@ -41,8 +41,8 @@ torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
4141
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
4242
torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
4343
torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
44-
tower = { version = "0", features = ["timeout"] }
45-
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
44+
tower = { version = "0", features = [ "timeout" ] }
45+
tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
4646
tracing = "0"
4747
url = "2"
4848

@@ -51,5 +51,5 @@ local-ip-address = "0"
5151
mockall = "0"
5252
torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "../rest-tracker-api-client" }
5353
torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
54-
url = { version = "2", features = ["serde"] }
55-
uuid = { version = "1", features = ["v4"] }
54+
url = { version = "2", features = [ "serde" ] }
55+
uuid = { version = "1", features = [ "v4" ] }

‎packages/axum-server/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "A wrapper for the Axum server for Torrust HTTP servers to add tim
44
documentation.workspace = true
55
edition.workspace = true
66
homepage.workspace = true
7-
keywords = ["axum", "server", "torrust", "wrapper"]
7+
keywords = [ "axum", "server", "torrust", "wrapper" ]
88
license.workspace = true
99
name = "torrust-axum-server"
1010
publish.workspace = true
@@ -14,19 +14,19 @@ rust-version.workspace = true
1414
version.workspace = true
1515

1616
[dependencies]
17-
axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
18-
camino = { version = "1", features = ["serde", "serde1"] }
17+
axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
18+
camino = { version = "1", features = [ "serde", "serde1" ] }
1919
futures-util = "0"
2020
http-body = "1"
2121
hyper = "1"
22-
hyper-util = { version = "0", features = ["http1", "http2", "tokio"] }
22+
hyper-util = { version = "0", features = [ "http1", "http2", "tokio" ] }
2323
pin-project-lite = "0"
2424
thiserror = "2"
25-
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
25+
tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
2626
torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
2727
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
2828
torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
29-
tower = { version = "0", features = ["timeout"] }
29+
tower = { version = "0", features = [ "timeout" ] }
3030
tracing = "0"
3131

3232
[dev-dependencies]

‎packages/clock/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
description = "A library to a clock for the torrust tracker."
3-
keywords = ["clock", "library", "torrents"]
3+
keywords = [ "clock", "library", "torrents" ]
44
name = "torrust-tracker-clock"
55
readme = "README.md"
66

@@ -16,7 +16,7 @@ rust-version.workspace = true
1616
version.workspace = true
1717

1818
[dependencies]
19-
chrono = { version = "0", default-features = false, features = ["clock"] }
19+
chrono = { version = "0", default-features = false, features = [ "clock" ] }
2020
lazy_static = "1"
2121
tracing = "0"
2222

0 commit comments

Comments
 (0)