Skip to content

Commit

Permalink
Merge pull request #5103 from systeminit/nick/cfff55e
Browse files Browse the repository at this point in the history
Remove unused Rust dependencies
  • Loading branch information
nickgerace authored Dec 11, 2024
2 parents 794d87e + 067db2e commit 869e5fc
Show file tree
Hide file tree
Showing 47 changed files with 684 additions and 3,273 deletions.
369 changes: 59 additions & 310 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,8 @@ chrono = { version = "0.4.37", features = ["serde"] }
ciborium = "0.2.2"
clap = { version = "4.5.4", features = ["derive", "color", "env", "wrap_help"] }
color-eyre = "0.6.3"
colored = "2.1.0"
comfy-table = { version = "7.1.0", features = [
"crossterm",
"tty",
"custom_styling",
] }
config = { version = "0.14.0", default-features = false, features = ["toml"] }
console = "0.15.8"
convert_case = "0.6.0"
criterion = { version = "0.5.1", features = ["async_tokio"] }
crossbeam-channel = "0.5.12"
crossbeam-queue = { version = "0.3.10" }
darling = "0.20.10"
deadpool = { version = "0.10.0", features = ["rt_tokio_1"] }
Expand Down Expand Up @@ -147,11 +138,8 @@ hyperlocal = { version = "0.8.0", default-features = false, features = [
"client",
] } # todo: using the very latest of hyper client 1.x, we _may_ be able to phase this crate
iftree = "1.0.5"
include_dir = "0.7.4"
indexmap = { version = "2.2.6", features = ["serde", "std"] }
indicatif = "0.17.8"
indoc = "2.0.5"
inquire = "0.7.4"
itertools = "0.12.1"
jwt-simple = { version = "0.12.9", default-features = false, features = [
"pure-rust",
Expand All @@ -172,7 +160,6 @@ nix = { version = "0.26.0", features = [
nkeys = "0.4.0"
num_cpus = "1.16.0"
once_cell = "1.19.0"
open = "5.1.2"
opentelemetry = { version = "0.26.0", features = ["trace"] }
opentelemetry-otlp = { version = "0.26.0", features = ["metrics", "trace"] }
opentelemetry-semantic-conventions = "0.14.0"
Expand All @@ -184,7 +171,6 @@ paste = "1.0.14"
pathdiff = "0.2.1"
petgraph = { version = "0.6.4", features = ["serde-1"] }
pin-project-lite = "0.2.13"
podman-api = "0.10.0"
postcard = { version = "1.0.8", features = ["use-std"] }
postgres-types = { version = "0.2.6", features = ["derive"] }
pretty_assertions_sorted = "1.2.3"
Expand Down Expand Up @@ -214,19 +200,15 @@ sea-orm = { version = "1.1.0", features = [
"with-chrono",
"debug-print",
] }
self-replace = "1.3.7"
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde-aux = "4.5.0"
serde_json = { version = "1.0.133", features = ["preserve_order"] }
serde_path_to_error = { version = "0.1.16" }
serde_qs = "0.13.0"
serde_url_params = "0.2.1"
serde_with = "3.7.0"
serde_yaml = "0.9.33" # NOTE(nick): this has been archived upstream
sodiumoxide = "0.2.7"
spicedb-client = { version = "0.1.1", features = ["tls"] }
spicedb-grpc = "0.1.1"
stream-cancel = "0.8.2"
strum = { version = "0.26.2", features = ["derive"] }
syn = { version = "2.0.55", features = ["full", "extra-traits"] }
sysinfo = "0.32.0"
Expand All @@ -247,7 +229,6 @@ tokio-postgres = { version = "0.7.10", features = [
tokio-postgres-rustls = { version = "0.12.0" }
tokio-serde = { version = "0.9.0", features = ["json"] }
tokio-stream = { version = "0.1.15", features = ["sync", "time"] }
tokio-test = "0.4.4"
tokio-tungstenite = "0.20.1" # todo: pinning back from 0.21.0, upgrade this alongside hyper/http/axum/tokio-tungstenite,tower-http
tokio-util = { version = "0.7.10", features = ["codec", "rt"] }
tokio-vsock = { version = "0.4.0" }
Expand All @@ -274,8 +255,6 @@ ulid = { version = "1.1.2", features = ["serde"] }
url = { version = "2.5.0", features = ["serde"] }
uuid = { version = "1.8.0", features = ["serde", "v4"] }
version_check = "0.9.4"
vfs = "0.12.0"
vfs-tar = { version = "0.4.1", features = ["mmap"] }
webpki-roots = { version = "0.25.4" }
xxhash-rust = { version = "0.8.10", features = ["xxh3", "const_xxh3"] }
y-sync = { version = "0.4.0", features = ["net"] }
Expand Down
1 change: 0 additions & 1 deletion lib/asset-sprayer/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ load("@prelude-si//:macros.bzl", "rust_library")
rust_library(
name = "asset-sprayer",
deps = [
"//lib/dal:dal",
"//lib/si-std:si-std",
"//lib/telemetry-rs:telemetry",
"//third-party/rust:async-openai",
Expand Down
7 changes: 3 additions & 4 deletions lib/asset-sprayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ rust-version.workspace = true
publish.workspace = true

[dependencies]
si-std = { path = "../../lib/si-std" }
telemetry = { path = "../../lib/telemetry-rs" }

async-openai = { workspace = true }
dal = { path = "../../lib/dal" }
include_dir = { workspace = true }
remain = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_with = { workspace = true }
serde_yaml = { workspace = true }
si-std = { path = "../../lib/si-std" }
strum = { workspace = true }
telemetry = { path = "../../lib/telemetry-rs" }
thiserror = { workspace = true }
tokio = { workspace = true }
2 changes: 0 additions & 2 deletions lib/auth-api-client/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ load("@prelude-si//:macros.bzl", "rust_library")
rust_library(
name = "auth-api-client",
deps = [
"//lib/telemetry-rs:telemetry",
"//third-party/rust:chrono",
"//third-party/rust:remain",
"//third-party/rust:reqwest",
"//third-party/rust:serde",
Expand Down
2 changes: 0 additions & 2 deletions lib/auth-api-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ rust-version.workspace = true
publish.workspace = true

[dependencies]
chrono = { workspace = true }
remain = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
telemetry = { path = "../../lib/telemetry-rs" }
thiserror = { workspace = true }
tokio = { workspace = true }
ulid = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion lib/cyclone-server/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ rust_library(
"//lib/bytes-lines-codec:bytes-lines-codec",
"//lib/cyclone-core:cyclone-core",
"//lib/si-crypto:si-crypto",
"//lib/si-settings:si-settings",
"//lib/si-std:si-std",
"//lib/telemetry-http-rs:telemetry-http",
"//lib/telemetry-rs:telemetry",
Expand Down
16 changes: 8 additions & 8 deletions lib/cyclone-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ rust-version.workspace = true
publish.workspace = true

[dependencies]
bytes-lines-codec = { path = "../bytes-lines-codec" }
cyclone-core = { path = "../../lib/cyclone-core" }
si-crypto = { path = "../../lib/si-crypto" }
si-std = { path = "../../lib/si-std" }
telemetry = { path = "../../lib/telemetry-rs" }
telemetry-utils = { path = "../../lib/telemetry-utils-rs" }
telemetry-http = { path = "../../lib/telemetry-http-rs" }

async-trait = { workspace = true }
axum = { workspace = true }
base64 = { workspace = true }
bytes-lines-codec = { path = "../bytes-lines-codec" }
chrono = { workspace = true }
cyclone-core = { path = "../../lib/cyclone-core" }
derive_builder = { workspace = true }
futures = { workspace = true }
hyper = { workspace = true }
Expand All @@ -23,12 +29,6 @@ pin-project-lite = { workspace = true }
remain = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
si-crypto = { path = "../../lib/si-crypto" }
si-settings = { path = "../../lib/si-settings" }
si-std = { path = "../../lib/si-std" }
telemetry = { path = "../../lib/telemetry-rs" }
telemetry-utils = { path = "../../lib/telemetry-utils-rs" }
telemetry-http = { path = "../../lib/telemetry-http-rs" }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-serde = { workspace = true }
Expand Down
2 changes: 0 additions & 2 deletions lib/dal-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,4 @@ quote = { workspace = true }
syn = { workspace = true }

[dev-dependencies]
dal = { path = "../dal" }
si-events = { path = "../si-events-rs" }
trybuild = { workspace = true }
3 changes: 1 addition & 2 deletions lib/dal-test/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@ rust_library(
"//lib/telemetry-rs:telemetry",
"//lib/veritech-client:veritech-client",
"//lib/veritech-server:veritech-server",
"//third-party/rust:base64",
"//third-party/rust:async-recursion",
"//third-party/rust:base64",
"//third-party/rust:color-eyre",
"//third-party/rust:derive_builder",
"//third-party/rust:derive_more",
"//third-party/rust:itertools",
"//third-party/rust:jwt-simple",
"//third-party/rust:lazy_static",
"//third-party/rust:names",
"//third-party/rust:opentelemetry-otlp",
"//third-party/rust:opentelemetry_sdk",
"//third-party/rust:remain",
"//third-party/rust:serde",
Expand Down
1 change: 0 additions & 1 deletion lib/dal-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ itertools = { workspace = true }
jwt-simple = { workspace = true }
lazy_static = { workspace = true }
names = { workspace = true }
opentelemetry-otlp = { workspace = true }
opentelemetry_sdk = { workspace = true }
remain = { workspace = true }
serde = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion lib/data-warehouse-stream-client/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ rust_library(
"//third-party/rust:aws-sdk-firehose",
"//third-party/rust:base64",
"//third-party/rust:remain",
"//third-party/rust:serde_json",
"//third-party/rust:thiserror",
],
srcs = glob([
Expand Down
1 change: 0 additions & 1 deletion lib/data-warehouse-stream-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ aws-config = { workspace = true }
aws-sdk-firehose= { workspace = true }
base64 = { workspace = true }
remain = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
1 change: 0 additions & 1 deletion lib/module-index-client/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ rust_library(
deps = [
"//lib/module-index-types:module-index-types",
"//lib/si-pkg:si-pkg",
"//lib/telemetry-rs:telemetry",
"//third-party/rust:chrono",
"//third-party/rust:remain",
"//third-party/rust:reqwest",
Expand Down
1 change: 0 additions & 1 deletion lib/module-index-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ publish.workspace = true
[dependencies]
module-index-types = { path = "../../lib/module-index-types" }
si-pkg = { path = "../../lib/si-pkg" }
telemetry = { path = "../../lib/telemetry-rs" }

chrono = { workspace = true }
remain = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions lib/module-index-server/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ rust_library(
"//lib/buck2-resources:buck2-resources",
"//lib/module-index-types:module-index-types",
"//lib/si-data-pg:si-data-pg",
"//lib/si-pkg:si-pkg",
"//lib/si-hash:si-hash",
"//lib/si-jwt-public-key:si-jwt-public-key",
"//lib/si-pkg:si-pkg",
"//lib/si-posthog-rs:si-posthog",
"//lib/si-settings:si-settings",
"//lib/si-std:si-std",
Expand All @@ -28,7 +28,6 @@ rust_library(
"//third-party/rust:sea-orm",
"//third-party/rust:serde",
"//third-party/rust:serde_json",
"//third-party/rust:stream-cancel",
"//third-party/rust:thiserror",
"//third-party/rust:tokio",
"//third-party/rust:tokio-stream",
Expand Down
1 change: 0 additions & 1 deletion lib/module-index-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ rust-s3 = { workspace = true }
sea-orm = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
stream-cancel = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-stream = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion lib/nats-dead-letter-queue/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ rust_library(
name = "nats-dead-letter-queue",
deps = [
"//lib/si-data-nats:si-data-nats",
"//lib/telemetry-rs:telemetry",
"//third-party/rust:remain",
"//third-party/rust:thiserror",
],
Expand Down
4 changes: 2 additions & 2 deletions lib/nats-dead-letter-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true
publish.workspace = true

[dependencies]
remain = { workspace = true }
si-data-nats = { path = "../../lib/si-data-nats" }
telemetry-nats = { path = "../../lib/telemetry-nats-rs" }

remain = { workspace = true }
thiserror = { workspace = true }
5 changes: 0 additions & 5 deletions lib/object-tree/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@ rust_library(
name = "object-tree",
deps = [
"//lib/si-hash:si-hash",
"//third-party/rust:blake3",
"//third-party/rust:petgraph",
"//third-party/rust:remain",
"//third-party/rust:serde",
"//third-party/rust:serde_json",
"//third-party/rust:strum",
"//third-party/rust:tar",
"//third-party/rust:tempfile",
"//third-party/rust:thiserror",
"//third-party/rust:tokio",
"//third-party/rust:vfs",
"//third-party/rust:vfs-tar",
],
srcs = glob(["src/**/*.rs"]),
)
6 changes: 1 addition & 5 deletions lib/object-tree/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ si-hash = { path = "../../lib/si-hash" }
petgraph = { workspace = true }
remain = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
strum = { workspace = true }
tar = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
vfs = { workspace = true }
vfs-tar = { workspace = true }
serde_json = { workspace = true }
1 change: 0 additions & 1 deletion lib/pinga-server/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ rust_library(
"//third-party/rust:remain",
"//third-party/rust:serde",
"//third-party/rust:serde_json",
"//third-party/rust:stream-cancel",
"//third-party/rust:thiserror",
"//third-party/rust:tokio",
"//third-party/rust:tokio-stream",
Expand Down
14 changes: 7 additions & 7 deletions lib/pinga-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ publish.workspace = true
[dependencies]
buck2-resources = { path = "../../lib/buck2-resources" }
dal = { path = "../../lib/dal" }
derive_builder = { workspace = true }
futures = { workspace = true }
nats-subscriber = { path = "../../lib/nats-subscriber" }
naxum = { path = "../../lib/naxum" }
pinga-core = { path = "../../lib/pinga-core" }
rebaser-client = { path = "../../lib/rebaser-client" }
remain = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
si-crypto = { path = "../../lib/si-crypto" }
si-data-nats = { path = "../../lib/si-data-nats" }
si-data-pg = { path = "../../lib/si-data-pg" }
si-layer-cache = { path = "../../lib/si-layer-cache" }
si-settings = { path = "../../lib/si-settings" }
si-std = { path = "../../lib/si-std" }
stream-cancel = { workspace = true }
telemetry = { path = "../../lib/telemetry-rs" }
telemetry-nats = { path = "../../lib/telemetry-nats-rs" }
telemetry-utils = { path = "../../lib/telemetry-utils-rs" }
veritech-client = { path = "../../lib/veritech-client" }

derive_builder = { workspace = true }
futures = { workspace = true }
remain = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-stream = { workspace = true }
tokio-util = { workspace = true }
ulid = { workspace = true }
veritech-client = { path = "../../lib/veritech-client" }
5 changes: 1 addition & 4 deletions lib/sdf-server/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ rust_library(
"//third-party/rust:reqwest",
"//third-party/rust:serde",
"//third-party/rust:serde_json",
"//third-party/rust:serde_qs",
"//third-party/rust:serde_with",
"//third-party/rust:sodiumoxide",
"//third-party/rust:strum",
Expand All @@ -58,13 +57,12 @@ rust_library(
"//third-party/rust:tokio-stream",
"//third-party/rust:tokio-tungstenite",
"//third-party/rust:tokio-util",
"//third-party/rust:tracing-tunnel",
"//third-party/rust:tower",
"//third-party/rust:tower-http",
"//third-party/rust:tracing-tunnel",
"//third-party/rust:ulid",
"//third-party/rust:url",
"//third-party/rust:y-sync",
"//third-party/rust:yrs",
],
srcs = glob(["src/**/*.rs"]),
extra_test_targets = [":test-integration"],
Expand All @@ -91,7 +89,6 @@ rust_test(
"//third-party/rust:pretty_assertions_sorted",
"//third-party/rust:serde",
"//third-party/rust:serde_json",
"//third-party/rust:serde_url_params",
"//third-party/rust:tokio",
"//third-party/rust:tokio-tungstenite",
"//third-party/rust:tokio-util",
Expand Down
Loading

0 comments on commit 869e5fc

Please sign in to comment.