Skip to content

Commit 3fd9f26

Browse files
authored
Remove getrandom feature flag overrides (#7421)
These have been required at some point in our codebase to get getrandom v0.2 and v0.3 to coexsit in wasm setup. However, the world has moved from getrandom v0.2 and override situation is not as complicated anymore. It seems we can wholesale remove these overrides that we kept around for way too long. fix #7382 Signed-off-by: Robert Kruszewski <github@robertk.io> Signed-off-by: Robert Kruszewski <github@robertk.io>
1 parent d352612 commit 3fd9f26

11 files changed

Lines changed: 1 addition & 40 deletions

File tree

.cargo/config.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ rustflags = [
33
"-C", "force-frame-pointers=yes",
44
]
55

6-
[target.wasm32-unknown-unknown]
7-
rustflags = ['--cfg', 'getrandom_backend="wasm_js"', '-C', 'target-feature=+atomics']
8-
96
[alias]
107
xtask = "run -p xtask --"
118
vx = "run -p vortex-tui --"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
runner: amd64-medium
204204
target: wasm32-unknown-unknown
205205
env:
206-
rustflags: "RUSTFLAGS='-A warnings'"
206+
rustflags: "RUSTFLAGS='-A warnings --cfg getrandom_backend=\"unsupported\"'"
207207
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-cuda --exclude vortex-cub --exclude vortex-nvcomp --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd --exclude vortex-test-e2e-cuda --exclude vortex-sqllogictest"
208208
steps:
209209
- uses: runs-on/action@v2

Cargo.lock

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,6 @@ vortex-duckdb = { path = "./vortex-duckdb", default-features = false }
302302
vortex-test-e2e-cuda = { path = "./vortex-test/e2e-cuda", default-features = false }
303303
vortex-tui = { path = "./vortex-tui" }
304304

305-
[workspace.dependencies.getrandom_v03]
306-
features = ["wasm_js"]
307-
package = "getrandom"
308-
version = "0.4.0"
309-
310305
[workspace.lints.rust]
311306
let_underscore_drop = "deny"
312307
macro_use_extern_crate = "deny"

encodings/parquet-variant/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@ vortex-session = { workspace = true }
3636
rstest = { workspace = true }
3737
vortex-array = { workspace = true, features = ["_test-harness"] }
3838

39-
[package.metadata.cargo-machete]
40-
ignored = ["getrandom_v03"]

encodings/pco/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,3 @@ vortex-session = { workspace = true }
2929
rstest = { workspace = true }
3030
vortex-array = { workspace = true, features = ["_test-harness"] }
3131

32-
[package.metadata.cargo-machete]
33-
ignored = ["getrandom_v03"]

vortex-array/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ cudarc = { workspace = true, optional = true }
3838
enum-iterator = { workspace = true }
3939
flatbuffers = { workspace = true }
4040
futures = { workspace = true, features = ["alloc", "async-await", "std"] }
41-
getrandom_v03 = { workspace = true }
4241
goldenfile = { workspace = true, optional = true }
4342
half = { workspace = true, features = ["num-traits"] }
4443
humansize = { workspace = true }
@@ -184,6 +183,3 @@ harness = false
184183
[[bench]]
185184
name = "listview_rebuild"
186185
harness = false
187-
188-
[package.metadata.cargo-machete]
189-
ignored = ["getrandom_v03"]

vortex-btrblocks/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ rust-version = { workspace = true }
1414
version = { workspace = true }
1515

1616
[dependencies]
17-
getrandom_v03 = { workspace = true }
1817
itertools = { workspace = true }
1918
num-traits = { workspace = true }
2019
pco = { workspace = true, optional = true }
@@ -64,6 +63,3 @@ test = false
6463
name = "compress_listview"
6564
harness = false
6665
test = false
67-
68-
[package.metadata.cargo-machete]
69-
ignored = ["getrandom_v03"]

vortex-file/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ async-trait = { workspace = true }
2121
bytes = { workspace = true }
2222
flatbuffers = { workspace = true }
2323
futures = { workspace = true, features = ["std", "async-await"] }
24-
getrandom_v03 = { workspace = true } # Needed to pickup the "wasm_js" feature for wasm targets from the workspace configuration
2524
itertools = { workspace = true }
2625
kanal = { workspace = true }
2726
moka = { workspace = true, features = ["sync"] }
@@ -31,7 +30,6 @@ parking_lot = { workspace = true }
3130
pin-project-lite = { workspace = true }
3231
tokio = { workspace = true, features = ["rt"], optional = true }
3332
tracing = { workspace = true }
34-
uuid = { workspace = true } # Needed to pickup the "js" feature for wasm targets from the workspace configuration
3533
vortex-alp = { workspace = true }
3634
vortex-array = { workspace = true }
3735
vortex-btrblocks = { workspace = true }
@@ -84,6 +82,3 @@ unstable_encodings = [
8482
"vortex-zstd?/unstable_encodings",
8583
"vortex-btrblocks/unstable_encodings",
8684
]
87-
88-
[package.metadata.cargo-machete]
89-
ignored = ["getrandom_v03", "uuid"]

vortex-io/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ async-stream = { workspace = true }
2222
async-trait = { workspace = true }
2323
bytes = { workspace = true }
2424
futures = { workspace = true, features = ["std", "executor"] }
25-
getrandom_v03 = { workspace = true } # Needed to pickup the "wasm_js" feature for wasm targets from the workspace configuration
2625
glob = { workspace = true }
2726
handle = "1.0.2"
2827
kanal = { workspace = true }
@@ -67,6 +66,3 @@ tokio = ["tokio/fs", "tokio/rt-multi-thread"]
6766

6867
[lints]
6968
workspace = true
70-
71-
[package.metadata.cargo-machete]
72-
ignored = ["getrandom_v03"]

0 commit comments

Comments
 (0)