From 51dd8e913db4712cb17dd34f4acd86100ecf3e03 Mon Sep 17 00:00:00 2001 From: SirCipher Date: Fri, 7 Jun 2024 09:18:08 +0100 Subject: [PATCH 1/3] Removes unused dependencies --- api/swimos_api/Cargo.toml | 2 -- client/fixture/Cargo.toml | 1 - client/swimos_client/Cargo.toml | 1 - example_apps/transit/Cargo.toml | 1 - runtime/swimos_messages/Cargo.toml | 1 - runtime/swimos_remote/Cargo.toml | 1 - runtime/swimos_runtime/Cargo.toml | 4 ---- server/swimos_agent/Cargo.toml | 1 - server/swimos_server_app/Cargo.toml | 1 - swimos_utilities/swimos_future/Cargo.toml | 2 -- swimos_utilities/swimos_io/Cargo.toml | 3 --- swimos_utilities/swimos_multi_reader/Cargo.toml | 2 -- swimos_utilities/swimos_route/Cargo.toml | 1 - swimos_utilities/swimos_sync/Cargo.toml | 2 -- 14 files changed, 23 deletions(-) diff --git a/api/swimos_api/Cargo.toml b/api/swimos_api/Cargo.toml index f878e8bb6..921f90570 100644 --- a/api/swimos_api/Cargo.toml +++ b/api/swimos_api/Cargo.toml @@ -15,6 +15,4 @@ bytes = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true, features = ["codec"] } static_assertions = { workspace = true } -uuid = { workspace = true } http = { workspace = true } -url = { workspace = true } diff --git a/client/fixture/Cargo.toml b/client/fixture/Cargo.toml index d6ef7511b..22f13bf30 100644 --- a/client/fixture/Cargo.toml +++ b/client/fixture/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -swimos_runtime = { path = "../../runtime/swimos_runtime" } swimos_remote = { path = "../../runtime/swimos_remote" } swimos_net = { path = "../../runtime/swimos_net" } swimos_api = { path = "../../api/swimos_api" } diff --git a/client/swimos_client/Cargo.toml b/client/swimos_client/Cargo.toml index 35e4c6cf9..502b05aeb 100644 --- a/client/swimos_client/Cargo.toml +++ b/client/swimos_client/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" default = [] tls = ["swimos_tls"] deflate = ["runtime/deflate"] -trust_dns = ["swimos_runtime/trust_dns"] [dependencies] swimos_tls = { path = "../../runtime/swimos_tls", optional = true } diff --git a/example_apps/transit/Cargo.toml b/example_apps/transit/Cargo.toml index d08332a57..222e01c92 100644 --- a/example_apps/transit/Cargo.toml +++ b/example_apps/transit/Cargo.toml @@ -12,7 +12,6 @@ tokio-util = { workspace = true, features = ["io"] } example-util = { path = "../example_util" } serde = { workspace = true, features = ["derive"] } csv = "1.2" -serde-xml-rs = "0.6" thiserror = { workspace = true } percent-encoding = { workspace = true } reqwest = { workspace = true, features = ["rustls-tls", "gzip"] } diff --git a/runtime/swimos_messages/Cargo.toml b/runtime/swimos_messages/Cargo.toml index 0aacab41e..9ba4c8710 100644 --- a/runtime/swimos_messages/Cargo.toml +++ b/runtime/swimos_messages/Cargo.toml @@ -22,4 +22,3 @@ tokio = { workspace = true, features = ["macros", "rt"] } uuid = { workspace = true, features = ["v4"] } swimos_utilities = { path = "../../swimos_utilities", features = ["buf_channel"] } rand = { workspace = true } -swimos_api = { path = "../../api/swimos_api" } diff --git a/runtime/swimos_remote/Cargo.toml b/runtime/swimos_remote/Cargo.toml index d9ab101a4..34c970c64 100644 --- a/runtime/swimos_remote/Cargo.toml +++ b/runtime/swimos_remote/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] ratchet = { workspace = true, features = ["deflate", "split"] } -ratchet_fixture = { workspace = true } bytes = { workspace = true } flate2 = { workspace = true } futures = { workspace = true } diff --git a/runtime/swimos_runtime/Cargo.toml b/runtime/swimos_runtime/Cargo.toml index b933aac69..2edc87aaf 100644 --- a/runtime/swimos_runtime/Cargo.toml +++ b/runtime/swimos_runtime/Cargo.toml @@ -6,13 +6,11 @@ edition = "2021" [features] default = [] -trust_dns = ["trust-dns-resolver"] [dependencies] bitflags = { workspace = true } bytes = { workspace = true } either = { workspace = true } -flate2 = { workspace = true } futures = { workspace = true } futures-util = { workspace = true } http = { workspace = true } @@ -24,7 +22,6 @@ swimos_agent_protocol = { path = "../../api/swimos_agent_protocol" } swimos_meta = { path = "../../api/swimos_meta" } swimos_model = { path = "../../api/swimos_model" } swimos_form = { path = "../../api/swimos_form" } -swimos_tracing = { path = "../../swimos_utilities/swimos_tracing" } swimos_recon = { path = "../../api/formats/swimos_recon" } swimos_messages = { path = "../swimos_messages" } swimos_net = { path = "../swimos_net" } @@ -33,7 +30,6 @@ thiserror = { workspace = true } tokio-stream = { workspace = true, features = ["sync"] } uuid = { workspace = true } static_assertions = { workspace = true } -trust-dns-resolver = { workspace = true, optional = true } nom = { workspace = true } percent-encoding = { workspace = true } diff --git a/server/swimos_agent/Cargo.toml b/server/swimos_agent/Cargo.toml index 55935e256..14be41f7c 100644 --- a/server/swimos_agent/Cargo.toml +++ b/server/swimos_agent/Cargo.toml @@ -14,7 +14,6 @@ swimos_utilities = { path = "../../swimos_utilities", features = ["io", "trigger swimos_model = { path = "../../api/swimos_model" } swimos_form = { path = "../../api/swimos_form" } swimos_recon = { path = "../../api/formats/swimos_recon" } -swimos_downlink = { path = "../../swimos_downlink" } bytes = { workspace = true } tokio = { workspace = true, features = ["macros", "time"] } tokio-util = { workspace = true, features = ["codec"] } diff --git a/server/swimos_server_app/Cargo.toml b/server/swimos_server_app/Cargo.toml index f329b1ae2..4a3e80b07 100644 --- a/server/swimos_server_app/Cargo.toml +++ b/server/swimos_server_app/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" [features] default = [] rocks_store = ["swimos_persistence/rocks", "rocksdb"] -trust_dns = ["swimos_runtime/trust_dns"] [dependencies] futures = { workspace = true } diff --git a/swimos_utilities/swimos_future/Cargo.toml b/swimos_utilities/swimos_future/Cargo.toml index 74db5bd29..c45b0a940 100644 --- a/swimos_utilities/swimos_future/Cargo.toml +++ b/swimos_utilities/swimos_future/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" either = { workspace = true } futures = { workspace = true } tokio = { workspace = true, features = ["sync", "time"] } -tokio-util = { workspace = true, features = ["codec"] } pin-project = { workspace = true } swimos_trigger = { path = "../swimos_trigger" } rand = { workspace = true } @@ -16,5 +15,4 @@ swimos_num = { path = "../swimos_num" } [dev-dependencies] tokio = { workspace = true, features = ["sync", "time", "rt", "macros"] } -tokio-stream = { workspace = true } parking_lot = { workspace = true } diff --git a/swimos_utilities/swimos_io/Cargo.toml b/swimos_utilities/swimos_io/Cargo.toml index e1ed93308..b6b425ebc 100644 --- a/swimos_utilities/swimos_io/Cargo.toml +++ b/swimos_utilities/swimos_io/Cargo.toml @@ -3,8 +3,5 @@ name = "swimos_io" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -tokio = { workspace = true, features = ["io-util"] } tempdir = { workspace = true } diff --git a/swimos_utilities/swimos_multi_reader/Cargo.toml b/swimos_utilities/swimos_multi_reader/Cargo.toml index 79480e11d..78eaf577f 100644 --- a/swimos_utilities/swimos_multi_reader/Cargo.toml +++ b/swimos_utilities/swimos_multi_reader/Cargo.toml @@ -18,8 +18,6 @@ tokio = { workspace = true, features = ["rt-multi-thread", "test-util", "macros" futures = { workspace = true, features = ["io-compat", "compat"] } criterion = { workspace = true, features = ["async_tokio"] } rand = { workspace = true } -swimos_api = { path = "../../api/swimos_api" } -swimos_runtime = { path = "../../runtime/swimos_runtime" } swimos_messages = { path = "../../runtime/swimos_messages" } swimos_model = { path = "../../api/swimos_model" } swimos_form = { path = "../../api/swimos_form" } diff --git a/swimos_utilities/swimos_route/Cargo.toml b/swimos_utilities/swimos_route/Cargo.toml index fbfe7eb2e..c1abf6e50 100644 --- a/swimos_utilities/swimos_route/Cargo.toml +++ b/swimos_utilities/swimos_route/Cargo.toml @@ -5,7 +5,6 @@ authors = ["Swim Inc. developers info@swim.ai"] edition = "2021" [dependencies] -http = { workspace = true } percent-encoding = { workspace = true } nom = { workspace = true } nom_locate = { workspace = true } diff --git a/swimos_utilities/swimos_sync/Cargo.toml b/swimos_utilities/swimos_sync/Cargo.toml index ec7fc79c6..d3f8d0288 100644 --- a/swimos_utilities/swimos_sync/Cargo.toml +++ b/swimos_utilities/swimos_sync/Cargo.toml @@ -8,10 +8,8 @@ edition = "2021" crossbeam-queue = { workspace = true } futures = { workspace = true } parking_lot = { workspace = true } -swimos_future = { path = "../swimos_future" } swimos_num = { path = "../swimos_num" } [dev-dependencies] futures = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -swimos_trigger = { path = "../swimos_trigger" } \ No newline at end of file From fbf5790636764b2c8664502251616cbdf94e2065 Mon Sep 17 00:00:00 2001 From: SirCipher Date: Fri, 7 Jun 2024 09:23:51 +0100 Subject: [PATCH 2/3] Revert Trust DNS flags --- client/swimos_client/Cargo.toml | 1 + runtime/swimos_runtime/Cargo.toml | 4 ++++ server/swimos_server_app/Cargo.toml | 1 + 3 files changed, 6 insertions(+) diff --git a/client/swimos_client/Cargo.toml b/client/swimos_client/Cargo.toml index 502b05aeb..35e4c6cf9 100644 --- a/client/swimos_client/Cargo.toml +++ b/client/swimos_client/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" default = [] tls = ["swimos_tls"] deflate = ["runtime/deflate"] +trust_dns = ["swimos_runtime/trust_dns"] [dependencies] swimos_tls = { path = "../../runtime/swimos_tls", optional = true } diff --git a/runtime/swimos_runtime/Cargo.toml b/runtime/swimos_runtime/Cargo.toml index 2edc87aaf..b933aac69 100644 --- a/runtime/swimos_runtime/Cargo.toml +++ b/runtime/swimos_runtime/Cargo.toml @@ -6,11 +6,13 @@ edition = "2021" [features] default = [] +trust_dns = ["trust-dns-resolver"] [dependencies] bitflags = { workspace = true } bytes = { workspace = true } either = { workspace = true } +flate2 = { workspace = true } futures = { workspace = true } futures-util = { workspace = true } http = { workspace = true } @@ -22,6 +24,7 @@ swimos_agent_protocol = { path = "../../api/swimos_agent_protocol" } swimos_meta = { path = "../../api/swimos_meta" } swimos_model = { path = "../../api/swimos_model" } swimos_form = { path = "../../api/swimos_form" } +swimos_tracing = { path = "../../swimos_utilities/swimos_tracing" } swimos_recon = { path = "../../api/formats/swimos_recon" } swimos_messages = { path = "../swimos_messages" } swimos_net = { path = "../swimos_net" } @@ -30,6 +33,7 @@ thiserror = { workspace = true } tokio-stream = { workspace = true, features = ["sync"] } uuid = { workspace = true } static_assertions = { workspace = true } +trust-dns-resolver = { workspace = true, optional = true } nom = { workspace = true } percent-encoding = { workspace = true } diff --git a/server/swimos_server_app/Cargo.toml b/server/swimos_server_app/Cargo.toml index 4a3e80b07..f329b1ae2 100644 --- a/server/swimos_server_app/Cargo.toml +++ b/server/swimos_server_app/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" [features] default = [] rocks_store = ["swimos_persistence/rocks", "rocksdb"] +trust_dns = ["swimos_runtime/trust_dns"] [dependencies] futures = { workspace = true } From 6149e30f7311fe500fe86a479cad44e27223c15e Mon Sep 17 00:00:00 2001 From: SirCipher Date: Wed, 12 Jun 2024 15:31:57 +0100 Subject: [PATCH 3/3] Adds missing dependencies --- swimos_utilities/swimos_multi_reader/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swimos_utilities/swimos_multi_reader/Cargo.toml b/swimos_utilities/swimos_multi_reader/Cargo.toml index cb50a585f..bef5be006 100644 --- a/swimos_utilities/swimos_multi_reader/Cargo.toml +++ b/swimos_utilities/swimos_multi_reader/Cargo.toml @@ -18,6 +18,8 @@ tokio = { workspace = true, features = ["rt-multi-thread", "test-util", "macros" futures = { workspace = true, features = ["io-compat", "compat"] } criterion = { workspace = true, features = ["async_tokio"] } rand = { workspace = true } +swimos_api = { path = "../../api/swimos_api" } +swimos_runtime = { path = "../../runtime/swimos_runtime" } swimos_messages = { path = "../../runtime/swimos_messages" } swimos_model = { path = "../../api/swimos_model" } swimos_form = { path = "../../api/swimos_form" }