Skip to content

Commit 4984bfd

Browse files
AdamGSrobert3005
andauthored
Lint all toml files using Taplo (#2455)
[taplo](https://taplo.tamasfe.dev/) is a pretty nice tool for doing all kinds of things with TOML, including the vscode extension and a TOML LSP. It also has a formatter so we can stop having changes that move random things around in `Cargo.toml`. I also added `cargo-sort` because the sorting functionality is nicer moving the dependencies around and nothing else (as you can see from this PR, taplo is quiet aggressive). --------- Co-authored-by: Robert Kruszewski <[email protected]>
1 parent 250c31b commit 4984bfd

File tree

40 files changed

+350
-361
lines changed

40 files changed

+350
-361
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ env:
2121
RUST_BACKTRACE: 1
2222

2323
jobs:
24+
lint-toml:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
- uses: spiraldb/actions/.github/actions/[email protected]
29+
2430
validate-workflow-yaml:
2531
runs-on: ubuntu-latest
2632
steps:
@@ -39,7 +45,6 @@ jobs:
3945
steps:
4046
- uses: actions/checkout@v4
4147
- uses: spiraldb/actions/.github/actions/[email protected]
42-
4348
- name: Python Lint - Format
4449
run: uv run ruff format --check .
4550
- name: Python Lint - Ruff

Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ exclude = ["wasm-test"]
2828
resolver = "2"
2929

3030
[workspace.package]
31-
version = "0.25.2"
32-
homepage = "https://github.com/spiraldb/vortex"
33-
repository = "https://github.com/spiraldb/vortex"
3431
authors = ["Vortex Authors <[email protected]>"]
35-
license = "Apache-2.0"
36-
keywords = ["vortex"]
32+
categories = ["database-implementations", "data-structures", "compression"]
33+
edition = "2024"
34+
homepage = "https://github.com/spiraldb/vortex"
3735
include = [
3836
"benches/*.rs",
3937
"build.rs",
@@ -43,10 +41,12 @@ include = [
4341
"flatbuffers/**/*.fbs",
4442
"README.md",
4543
]
46-
edition = "2024"
47-
rust-version = "1.86"
44+
keywords = ["vortex"]
45+
license = "Apache-2.0"
4846
readme = "README.md"
49-
categories = ["database-implementations", "data-structures", "compression"]
47+
repository = "https://github.com/spiraldb/vortex"
48+
rust-version = "1.86"
49+
version = "0.25.2"
5050

5151
[workspace.dependencies]
5252
anyhow = "1.0.95"
@@ -92,6 +92,7 @@ futures-executor = "0.3.31"
9292
futures-util = "0.3.31"
9393
getrandom = "0.3"
9494
goldenfile = "1"
95+
governor = "0.8"
9596
half = { version = "2.2.1", features = ["std", "num-traits"] }
9697
hashbrown = "0.15.1"
9798
homedir = "0.3.3"
@@ -103,7 +104,6 @@ libfuzzer-sys = "0.4"
103104
log = { version = "0.4.21" }
104105
mimalloc = "0.1.42"
105106
moka = { version = "0.12.10", default-features = false }
106-
governor = "0.8"
107107
num-traits = "0.2.19"
108108
num_enum = "0.7.2"
109109
object_store = "0.11.0"
@@ -150,8 +150,8 @@ static_assertions = "1.1"
150150
tabled = { version = "0.18.0", default-features = false }
151151
tar = "0.4"
152152
tempfile = "3"
153-
tikv-jemallocator = "0.6"
154153
thiserror = "2.0.3"
154+
tikv-jemallocator = "0.6"
155155
tokio = "1.36"
156156
tracing = { version = "0.1.41" }
157157
tracing-chrome = "0.7.2"
@@ -196,14 +196,14 @@ xshell = "0.2.6"
196196
zigzag = "0.1.0"
197197

198198
[workspace.dependencies.getrandom_v03]
199+
features = ["wasm_js"]
199200
package = "getrandom"
200201
version = "0.3.1"
201-
features = ["wasm_js"]
202202

203203
[workspace.dependencies.getrandom_v02]
204+
features = ["js"]
204205
package = "getrandom"
205206
version = "0.2.15"
206-
features = ["js"]
207207

208208
[workspace.lints.rust]
209209
macro_use_extern_crate = "deny"
@@ -219,15 +219,15 @@ as_ptr_cast_mut = "deny"
219219
borrow_as_ptr = "deny"
220220
cargo = { level = "deny", priority = -1 }
221221
cast_possible_truncation = "deny"
222-
collection_is_never_read = "deny"
223222
cognitive_complexity = "deny"
223+
collection_is_never_read = "deny"
224224
dbg_macro = "deny"
225225
debug_assert_with_mut_call = "deny"
226226
derive_partial_eq_without_eq = "deny"
227+
equatable_if_let = "deny"
227228
exit = "deny"
228229
expect_fun_call = "deny"
229230
expect_used = "deny"
230-
equatable_if_let = "deny"
231231
fallible_impl_from = "deny"
232232
get_unwrap = "deny"
233233
host_endian_bytes = "deny"
@@ -255,14 +255,14 @@ codegen-units = 1
255255
lto = "thin" # attempts to perform optimizations across all crates within the dependency graph
256256

257257
[profile.release_debug]
258-
inherits = "release"
259258
debug = "full"
259+
inherits = "release"
260260

261261
[profile.bench]
262262
codegen-units = 16
263263
debug = "full"
264264
lto = false
265265

266266
[profile.bench_assert]
267-
inherits = "bench"
268267
debug-assertions = true
268+
inherits = "bench"

bench-vortex/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
[package]
22
name = "bench-vortex"
3-
version = { workspace = true }
4-
publish = false
3+
authors = { workspace = true }
54
description = "End to end vortex benchmarks"
5+
edition = { workspace = true }
66
homepage = { workspace = true }
7-
repository = { workspace = true }
8-
authors = { workspace = true }
9-
license = { workspace = true }
10-
keywords = { workspace = true }
117
include = { workspace = true }
12-
edition = { workspace = true }
13-
rust-version = { workspace = true }
8+
keywords = { workspace = true }
9+
license = { workspace = true }
10+
publish = false
1411
readme = "README.md"
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
14+
version = { workspace = true }
1515

1616
[lints.rust]
17-
warnings = "deny"
1817
unsafe_op_in_unsafe_fn = "deny"
18+
warnings = "deny"
1919

2020
[lints.clippy]
2121
all = { level = "deny", priority = -1 }
@@ -77,6 +77,6 @@ vortex-metrics = { workspace = true }
7777
xshell = { workspace = true }
7878

7979
[features]
80-
mimalloc = []
8180
jemalloc = ["dep:tikv-jemallocator"]
81+
mimalloc = []
8282
tracing = ["vortex-datafusion/tracing"]

deny.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ all-features = true
55

66
no-default-features = false
77

8-
98
[output]
109
feature-depth = 1
1110

12-
1311
[advisories]
1412
ignore = ["RUSTSEC-2025-0009"]
1513

@@ -94,7 +92,6 @@ workspace-default-features = "allow"
9492
# on a crate-by-crate basis if desired.
9593
external-default-features = "allow"
9694

97-
9895
# This section is considered when running `cargo deny check sources`.
9996
# More documentation about the 'sources' section can be found here:
10097
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html

docs/pyproject.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ version = "0.1.0"
44
description = "Vortex documentation."
55
authors = []
66
dependencies = [
7-
"furo>=2024.8.6",
8-
"myst-parser>=4.0.0",
9-
"setuptools>=75.8.0", # Required by sphinxcontrib-bibtex
10-
"sphinx-autobuild>=2024.10.3",
11-
"sphinx-copybutton>=0.5.2",
12-
"sphinx-inline-tabs>=2023.4.21",
13-
"sphinx>=8.0.2",
14-
"sphinxcontrib-bibtex>=2.6.3",
15-
"sphinxext-opengraph>=0.9.1",
16-
"vortex-array",
7+
"furo>=2024.8.6",
8+
"myst-parser>=4.0.0",
9+
"setuptools>=75.8.0", # Required by sphinxcontrib-bibtex
10+
"sphinx-autobuild>=2024.10.3",
11+
"sphinx-copybutton>=0.5.2",
12+
"sphinx-inline-tabs>=2023.4.21",
13+
"sphinx>=8.0.2",
14+
"sphinxcontrib-bibtex>=2.6.3",
15+
"sphinxext-opengraph>=0.9.1",
16+
"vortex-array",
1717
]
1818
requires-python = ">= 3.10"
1919

encodings/alp/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[package]
22
name = "vortex-alp"
3+
authors = { workspace = true }
4+
categories = { workspace = true }
35
description = "Vortex ALP array"
4-
version = { workspace = true }
6+
edition = { workspace = true }
57
homepage = { workspace = true }
6-
repository = { workspace = true }
7-
authors = { workspace = true }
8-
license = { workspace = true }
9-
keywords = { workspace = true }
108
include = { workspace = true }
11-
edition = { workspace = true }
12-
rust-version = { workspace = true }
13-
categories = { workspace = true }
9+
keywords = { workspace = true }
10+
license = { workspace = true }
1411
readme = { workspace = true }
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
14+
version = { workspace = true }
1515

1616
[lints]
1717
workspace = true

encodings/bytebool/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[package]
22
name = "vortex-bytebool"
3-
version = { workspace = true }
3+
authors = { workspace = true }
4+
categories = { workspace = true }
45
description = "Vortex byte-boolean array"
6+
edition = { workspace = true }
57
homepage = { workspace = true }
6-
repository = { workspace = true }
7-
authors = { workspace = true }
8-
license = { workspace = true }
9-
keywords = { workspace = true }
108
include = { workspace = true }
11-
edition = { workspace = true }
12-
rust-version = { workspace = true }
13-
categories = { workspace = true }
9+
keywords = { workspace = true }
10+
license = { workspace = true }
1411
readme = { workspace = true }
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
14+
version = { workspace = true }
1515

1616
[lints]
1717
workspace = true

encodings/datetime-parts/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[package]
22
name = "vortex-datetime-parts"
3+
authors = { workspace = true }
4+
categories = { workspace = true }
35
description = "Vortex physical encoding that compresses temporal components individually"
4-
version = { workspace = true }
6+
edition = { workspace = true }
57
homepage = { workspace = true }
6-
repository = { workspace = true }
7-
authors = { workspace = true }
8-
license = { workspace = true }
9-
keywords = { workspace = true }
108
include = { workspace = true }
11-
edition = { workspace = true }
12-
rust-version = { workspace = true }
13-
categories = { workspace = true }
9+
keywords = { workspace = true }
10+
license = { workspace = true }
1411
readme = { workspace = true }
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
14+
version = { workspace = true }
1515

1616
[lints]
1717
workspace = true

encodings/dict/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
[package]
22
name = "vortex-dict"
3-
version = { workspace = true }
3+
authors = { workspace = true }
4+
categories = { workspace = true }
45
description = "Vortex dictionary array"
6+
edition = { workspace = true }
57
homepage = { workspace = true }
6-
repository = { workspace = true }
7-
authors = { workspace = true }
8-
license = { workspace = true }
9-
keywords = { workspace = true }
108
include = { workspace = true }
11-
edition = { workspace = true }
12-
rust-version = { workspace = true }
13-
categories = { workspace = true }
9+
keywords = { workspace = true }
10+
license = { workspace = true }
11+
1412
readme = { workspace = true }
13+
repository = { workspace = true }
14+
rust-version = { workspace = true }
15+
version = { workspace = true }
1516

1617
[features]
1718
test-harness = ["rand", "vortex-fsst"]
@@ -21,8 +22,8 @@ arrow-buffer = { workspace = true }
2122
num-traits = { workspace = true }
2223
# test-harness
2324
rand = { workspace = true, optional = true }
24-
rustc-hash = { workspace = true }
2525
rkyv = { workspace = true }
26+
rustc-hash = { workspace = true }
2627
vortex-array = { workspace = true }
2728
vortex-buffer = { workspace = true }
2829
vortex-dtype = { workspace = true }

encodings/fastlanes/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[package]
22
name = "vortex-fastlanes"
3-
version = { workspace = true }
3+
authors = { workspace = true }
4+
categories = { workspace = true }
45
description = "Vortex fastlanes arrays"
6+
edition = { workspace = true }
57
homepage = { workspace = true }
6-
repository = { workspace = true }
7-
authors = { workspace = true }
8-
license = { workspace = true }
9-
keywords = { workspace = true }
108
include = { workspace = true }
11-
edition = { workspace = true }
12-
rust-version = { workspace = true }
13-
categories = { workspace = true }
9+
keywords = { workspace = true }
10+
license = { workspace = true }
1411
readme = { workspace = true }
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
14+
version = { workspace = true }
1515

1616
[lints]
1717
workspace = true

0 commit comments

Comments
 (0)