From 2eb5635c58e8b1db80ca8f596d82f2d75b39a354 Mon Sep 17 00:00:00 2001 From: kasisnu <5044120+kasisnu@users.noreply.github.com> Date: Sun, 12 Nov 2023 16:06:04 +0530 Subject: [PATCH] removing some unused creates --- Cargo.lock | 465 +++++++----------- Cargo.toml | 4 + crates/_types/buckets/Cargo.toml | 1 + crates/_types/enums/Cargo.toml | 3 +- crates/_types/reusable_types/Cargo.toml | 4 +- crates/_types/tokens/Cargo.toml | 3 +- crates/cli/database_backup/Cargo.toml | 6 +- crates/cli/database_cleanup/Cargo.toml | 5 +- crates/cli/dev_database_seed/Cargo.toml | 1 + crates/cli/dev_upload_media_file/Cargo.toml | 2 +- crates/cli/elasticsearch-cli/Cargo.toml | 6 +- crates/cli/kubectl-pod-cleanup/Cargo.toml | 2 +- crates/cli/lru-delete-models/Cargo.toml | 6 - crates/cli/scrape_test/Cargo.toml | 1 + crates/lib/actix_helpers/Cargo.toml | 5 +- .../lib/api_clients/cloud_storage/Cargo.toml | 2 +- .../google_drive_common/Cargo.toml | 1 + .../lib/api_clients/twitch_common/Cargo.toml | 1 + crates/lib/bootstrap/Cargo.toml | 1 + crates/lib/caching/memory_caching/Cargo.toml | 5 +- crates/lib/caching/redis_caching/Cargo.toml | 1 + crates/lib/concurrency/Cargo.toml | 2 +- crates/lib/cookies/Cargo.toml | 1 + crates/lib/crockford/Cargo.toml | 1 + crates/lib/datetimes/Cargo.toml | 1 + crates/lib/deprecated/config/Cargo.toml | 1 + .../deprecated/container_common/Cargo.toml | 5 +- .../deprecated/http_server_common/Cargo.toml | 4 +- crates/lib/easyenv/Cargo.toml | 1 + crates/lib/elasticsearch_schema/Cargo.toml | 1 + crates/lib/errors/Cargo.toml | 1 + crates/lib/files/archives/Cargo.toml | 1 + crates/lib/files/filesys/Cargo.toml | 1 + crates/lib/files/hashing/Cargo.toml | 1 + crates/lib/files/images/Cargo.toml | 2 +- crates/lib/files/media/Cargo.toml | 3 +- crates/lib/files/mimetypes/Cargo.toml | 4 +- crates/lib/idempotency/Cargo.toml | 1 + crates/lib/jobs_common/Cargo.toml | 2 +- crates/lib/mysql_queries/Cargo.toml | 3 +- crates/lib/redis_common/Cargo.toml | 1 + crates/lib/server_environment/Cargo.toml | 7 +- crates/lib/sqlx_mysql_helpers/Cargo.toml | 1 + crates/lib/storyteller_root/Cargo.toml | 7 +- crates/lib/subprocess_common/Cargo.toml | 5 +- crates/lib/testing/Cargo.toml | 1 + crates/lib/tts_common/Cargo.toml | 1 + crates/lib/url_config/Cargo.toml | 3 +- crates/lib/user_input_common/Cargo.toml | 6 +- crates/lib/web_scrapers/Cargo.toml | 2 +- crates/service/job/analytics_job/Cargo.toml | 3 +- crates/service/job/download_job/Cargo.toml | 7 +- crates/service/job/inference_job/Cargo.toml | 4 +- .../service/job/tts_download_job/Cargo.toml | 7 +- .../service/job/tts_inference_job/Cargo.toml | 1 + .../service/job/w2l_download_job/Cargo.toml | 7 +- .../service/job/w2l_inference_job/Cargo.toml | 7 +- .../other/twitch_pubsub_subscriber/Cargo.toml | 28 -- crates/service/plugins/billing/Cargo.toml | 3 +- .../plugins/inference_workloads/Cargo.toml | 22 +- crates/service/plugins/users/Cargo.toml | 3 +- crates/service/web/dummy_service/Cargo.toml | 9 - crates/service/web/storyteller_web/Cargo.toml | 12 +- .../service/web/websocket_gateway/Cargo.toml | 20 +- .../newrelic-telemetry-sdk-rust/Cargo.toml | 1 + 65 files changed, 242 insertions(+), 487 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ea406bd1d3..f4b2e4ac73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,18 +570,15 @@ dependencies = [ name = "actix_helpers" version = "0.0.1" dependencies = [ - "actix-cors 0.6.4", - "actix-files", "actix-http 3.4.0", - "actix-multipart", "actix-rt 2.9.0", "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web 4.0.1", - "actix-web-actors", "cidr-utils", "errors", "futures-util", + "my-workspace-hack", "num-traits", "serde", "serde_json", @@ -702,7 +699,6 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "clap 2.34.0", "config", "container_common", "dotenv", @@ -710,8 +706,8 @@ dependencies = [ "enums", "errors", "hostname", - "jobs_common", "log", + "my-workspace-hack", "mysql_queries", "rand 0.8.5", "reusable_types", @@ -797,6 +793,7 @@ name = "archives" version = "0.0.1" dependencies = [ "errors", + "my-workspace-hack", "zip", ] @@ -864,7 +861,6 @@ dependencies = [ "smol_str", "thiserror", "tokio 1.34.0", - "uuid 0.8.2", ] [[package]] @@ -1061,6 +1057,7 @@ dependencies = [ "http_server_common", "log", "mockall", + "my-workspace-hack", "mysql_queries", "once_cell", "regex", @@ -1156,6 +1153,7 @@ dependencies = [ "errors", "hostname", "log", + "my-workspace-hack", "server_environment", ] @@ -1186,6 +1184,7 @@ version = "0.0.1" dependencies = [ "crockford", "errors", + "my-workspace-hack", ] [[package]] @@ -1423,8 +1422,8 @@ version = "0.0.1" dependencies = [ "anyhow", "buckets", - "container_common", "log", + "my-workspace-hack", "rust-s3", "tokio 1.34.0", ] @@ -1481,28 +1480,14 @@ dependencies = [ name = "component_subsystem_inference_workloads" version = "0.0.1" dependencies = [ - "actix-cors 0.6.4", - "actix-http 3.4.0", - "actix-web 4.0.1", - "anyhow", - "base64 0.21.0", - "chrono", - "container_common", - "dotenv", - "log", - "once_cell", - "regex", - "serde", - "serde_derive", - "serde_json", - "toml", + "my-workspace-hack", ] [[package]] name = "concurrency" version = "0.0.1" dependencies = [ - "errors", + "my-workspace-hack", ] [[package]] @@ -1520,6 +1505,7 @@ version = "0.0.1" dependencies = [ "anyhow", "easyenv", + "my-workspace-hack", "url", ] @@ -1546,13 +1532,11 @@ name = "container_common" version = "0.0.1" dependencies = [ "anyhow", - "errors", - "hashing", "log", + "my-workspace-hack", "once_cell", "rand 0.8.5", "serde", - "serde_json", "tempfile", "toml", "uuid 0.8.2", @@ -1593,6 +1577,7 @@ dependencies = [ "errors", "hmac 0.10.1", "jwt", + "my-workspace-hack", "sha2 0.9.5", ] @@ -1673,23 +1658,10 @@ dependencies = [ name = "crockford" version = "0.0.1" dependencies = [ + "my-workspace-hack", "rand 0.8.5", ] -[[package]] -name = "crossbeam" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils 0.8.16", -] - [[package]] name = "crossbeam-channel" version = "0.5.1" @@ -1905,17 +1877,13 @@ name = "database-backup" version = "0.0.1" dependencies = [ "anyhow", - "chrono", - "clap 2.34.0", - "config", "container_common", "dotenv", "easyenv", - "hostname", "log", + "my-workspace-hack", "serde", "serde_derive", - "serde_json", ] [[package]] @@ -1923,16 +1891,13 @@ name = "database-cleanup" version = "0.0.1" dependencies = [ "anyhow", - "chrono", - "config", "container_common", "dotenv", "easyenv", - "hostname", "log", + "my-workspace-hack", "serde", "serde_derive", - "serde_json", ] [[package]] @@ -1940,6 +1905,7 @@ name = "datetimes" version = "0.0.1" dependencies = [ "chrono", + "my-workspace-hack", "once_cell", ] @@ -2032,6 +1998,7 @@ dependencies = [ "idempotency", "log", "mimetypes", + "my-workspace-hack", "mysql_queries", "sqlx", "storyteller_root", @@ -2051,9 +2018,9 @@ dependencies = [ "enums", "errors", "filesys", - "hashing", "log", "mimetypes", + "my-workspace-hack", "mysql_queries", "sqlx", "tokens", @@ -2198,7 +2165,6 @@ dependencies = [ "anyhow", "bootstrap", "chrono", - "clap 2.34.0", "cloud_storage", "concurrency", "config", @@ -2214,11 +2180,10 @@ dependencies = [ "hostname", "hyper", "jobs_common", - "lfu", "log", "mimetypes", + "my-workspace-hack", "mysql_queries", - "newrelic-telemetry", "r2d2_redis", "reusable_types", "serde", @@ -2229,7 +2194,6 @@ dependencies = [ "subprocess_common", "tempdir", "tokio 1.34.0", - "tts_common", "zip", ] @@ -2252,32 +2216,23 @@ dependencies = [ name = "dummy-service" version = "0.0.1" dependencies = [ - "actix-cors 0.6.4", - "actix-files", "actix-http 3.4.0", - "actix-multipart", "actix-rt 2.9.0", "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web 4.0.1", - "actix-web-actors", "actix_helpers", "chrono", "dotenv", "easyenv", "errors", - "futures 0.1.31", - "futures 0.3.26", "futures-util", "hostname", - "http_server_common", - "jwt", "reusable_types", "serde", "serde_derive", "serde_json", "tokio 1.34.0", - "toml", ] [[package]] @@ -2293,6 +2248,7 @@ dependencies = [ "dotenv", "env_logger 0.10.0", "log", + "my-workspace-hack", "storyteller_root", ] @@ -2337,25 +2293,21 @@ version = "0.0.1" dependencies = [ "buckets", "clap 2.34.0", - "cloud_storage", "config", "easyenv", "elasticsearch", "elasticsearch_schema", "enums", "errors", - "filesys", - "hashing", - "idempotency", "log", - "mimetypes", + "my-workspace-hack", "mysql_queries", "serde", "serde_derive", "serde_json", "sqlx", "storyteller_root", - "strum 0.24.1", + "strum", "tokens", "tokio 1.34.0", ] @@ -2369,6 +2321,7 @@ dependencies = [ "enums", "errors", "log", + "my-workspace-hack", "serde", "serde_json", "tokens", @@ -2423,13 +2376,12 @@ dependencies = [ name = "enums" version = "0.0.1" dependencies = [ + "my-workspace-hack", "serde", "serde_derive", - "serde_json", "sqlx", "sqlx-core", - "strum 0.24.1", - "toml", + "strum", ] [[package]] @@ -2484,6 +2436,7 @@ name = "errors" version = "0.0.1" dependencies = [ "anyhow", + "my-workspace-hack", ] [[package]] @@ -2537,6 +2490,7 @@ name = "filesys" version = "0.0.1" dependencies = [ "errors", + "my-workspace-hack", ] [[package]] @@ -2743,12 +2697,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - [[package]] name = "futures-util" version = "0.3.29" @@ -2842,6 +2790,7 @@ dependencies = [ "anyhow", "container_common", "log", + "my-workspace-hack", "subprocess_common", "tempdir", ] @@ -2921,6 +2870,7 @@ dependencies = [ "data-encoding", "errors", "md-5", + "my-workspace-hack", "ring 0.17.0-alpha.11", ] @@ -3076,11 +3026,10 @@ dependencies = [ "anyhow", "base64 0.21.0", "chrono", - "container_common", - "dotenv", "errors", "language-tags 0.3.2", "log", + "my-workspace-hack", "once_cell", "regex", "reusable_types", @@ -3088,7 +3037,6 @@ dependencies = [ "serde_derive", "serde_json", "speculoos", - "toml", ] [[package]] @@ -3159,6 +3107,7 @@ dependencies = [ name = "idempotency" version = "0.0.1" dependencies = [ + "my-workspace-hack", "uuid 0.8.2", ] @@ -3214,7 +3163,7 @@ version = "0.0.1" dependencies = [ "errors", "image", - "log", + "my-workspace-hack", "testing", ] @@ -3263,7 +3212,6 @@ dependencies = [ "bootstrap", "buckets", "chrono", - "clap 2.34.0", "cloud_storage", "concurrency", "config", @@ -3278,11 +3226,11 @@ dependencies = [ "hyper", "images", "jobs_common", - "lfu", "log", "media", "memory_caching", "mimetypes", + "my-workspace-hack", "mysql_queries", "newrelic-telemetry", "once_cell", @@ -3295,7 +3243,6 @@ dependencies = [ "subprocess", "subprocess_common", "tempdir", - "testing", "tokens", "tokio 1.34.0", "tts_common", @@ -3378,15 +3325,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.7" @@ -3408,9 +3346,9 @@ dependencies = [ "container_common", "errors", "log", + "my-workspace-hack", "r2d2_redis", "redis_common", - "tempdir", ] [[package]] @@ -3472,8 +3410,8 @@ dependencies = [ "config", "easyenv", "errors", - "itertools 0.11.0", "log", + "my-workspace-hack", "once_cell", "rand 0.8.5", "regex", @@ -3670,12 +3608,8 @@ name = "lru-delete-models" version = "0.0.1" dependencies = [ "clap 4.4.7", - "easyenv", "errors", - "filesys", "logging", - "storyteller_root", - "tokio 1.34.0", "walkdir", ] @@ -3774,8 +3708,8 @@ version = "0.0.1" dependencies = [ "errors", "log", + "my-workspace-hack", "symphonia", - "symphonia-format-mkv 0.5.2", ] [[package]] @@ -3798,12 +3732,9 @@ name = "memory_caching" version = "0.0.1" dependencies = [ "anyhow", - "chrono", - "config", - "container_common", "errors", - "log", "lru_time_cache", + "my-workspace-hack", ] [[package]] @@ -3826,8 +3757,8 @@ dependencies = [ name = "mimetypes" version = "0.0.1" dependencies = [ - "errors", "infer 0.11.0", + "my-workspace-hack", ] [[package]] @@ -3936,12 +3867,93 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "my-workspace-hack" +version = "0.1.0" +dependencies = [ + "actix-rt 2.9.0", + "ahash 0.7.6", + "base64ct", + "bitflags 1.3.2", + "block-buffer 0.9.0", + "bytemuck", + "byteorder", + "cc", + "chrono", + "combine 4.6.3", + "crossbeam-utils 0.8.16", + "derive_more", + "digest 0.10.3", + "either", + "flate2", + "flume", + "futures 0.3.26", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", + "generic-array", + "getrandom 0.1.16", + "getrandom 0.2.8", + "hashbrown 0.12.3", + "hmac 0.12.1", + "hyper", + "indexmap", + "lazy_static", + "libc", + "log", + "memchr", + "miniz_oxide", + "native-tls", + "num-bigint 0.4.3", + "num-integer", + "num-iter", + "num-traits", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_core 0.6.2", + "regex", + "regex-automata", + "regex-syntax", + "reqwest", + "serde", + "serde_json", + "sha1 0.10.4", + "sha2 0.10.5", + "simd-adler32", + "socket2 0.4.7", + "sqlx", + "sqlx-core", + "sqlx-macros", + "standback", + "syn 1.0.107", + "syn 2.0.26", + "time 0.3.14", + "tokio 0.2.25", + "tokio 1.34.0", + "tokio-stream", + "tokio-util 0.6.9", + "tokio-util 0.7.4", + "tracing", + "tracing-core", + "twitch_oauth2", + "unicode-bidi", + "unicode-normalization", + "url", + "void", +] + [[package]] name = "mysql_queries" version = "0.0.1" dependencies = [ "anyhow", - "base64 0.21.0", "buckets", "chrono", "config", @@ -3950,6 +3962,7 @@ dependencies = [ "enums", "errors", "log", + "my-workspace-hack", "once_cell", "regex", "reusable_types", @@ -3957,7 +3970,6 @@ dependencies = [ "serde_derive", "serde_json", "sqlx", - "sqlx_mysql_helpers", "tokens", "toml", ] @@ -4033,6 +4045,7 @@ dependencies = [ "hyper", "hyper-tls", "log", + "my-workspace-hack", "rand 0.7.3", "serde", "serde_json", @@ -4583,7 +4596,7 @@ checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.5", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -4902,6 +4915,7 @@ name = "redis_caching" version = "0.0.1" dependencies = [ "errors", + "my-workspace-hack", "r2d2_redis", "serde", "serde_derive", @@ -4914,6 +4928,7 @@ version = "0.0.1" dependencies = [ "anyhow", "container_common", + "my-workspace-hack", "serde", "serde_derive", "serde_json", @@ -5037,13 +5052,11 @@ dependencies = [ name = "reusable_types" version = "0.0.1" dependencies = [ - "anyhow", "chrono", + "my-workspace-hack", "serde", "serde_derive", - "serde_json", "sqlx", - "toml", ] [[package]] @@ -5076,17 +5089,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rpassword" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" -dependencies = [ - "libc", - "rtoolbox", - "winapi 0.3.9", -] - [[package]] name = "rsa" version = "0.6.1" @@ -5119,16 +5121,6 @@ dependencies = [ "quick-xml 0.27.1", ] -[[package]] -name = "rtoolbox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "rust-ini" version = "0.18.0" @@ -5312,6 +5304,7 @@ version = "0.0.1" dependencies = [ "clap 2.34.0", "errors", + "my-workspace-hack", "tokio 1.34.0", "web_scrapers", ] @@ -5543,10 +5536,7 @@ dependencies = [ name = "server_environment" version = "0.0.1" dependencies = [ - "dotenv", - "easyenv", - "errors", - "log", + "my-workspace-hack", ] [[package]] @@ -5754,7 +5744,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" dependencies = [ - "itertools 0.10.5", + "itertools", "nom", "unicode_categories", ] @@ -5859,6 +5849,7 @@ name = "sqlx_mysql_helpers" version = "0.0.1" dependencies = [ "errors", + "my-workspace-hack", "sqlx", ] @@ -5950,14 +5941,12 @@ name = "storyteller-web" version = "0.0.1" dependencies = [ "actix-cors 0.6.4", - "actix-files", "actix-http 3.4.0", "actix-multipart", "actix-rt 2.9.0", "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web 4.0.1", - "actix-web-actors", "actix_helpers", "anyhow", "async-stripe", @@ -5995,12 +5984,10 @@ dependencies = [ "http_server_common", "hyper", "infer 0.5.0", - "jobs_common", "jwt", "language-tags 0.3.2", "lazy_static", "lexical-sort", - "lfu", "limitation", "log", "lru_time_cache", @@ -6011,7 +5998,6 @@ dependencies = [ "mimetypes", "mysql_queries", "native-tls", - "newrelic-telemetry", "once_cell", "pin-project-lite 0.2.13", "pulldown-cmark", @@ -6031,15 +6017,12 @@ dependencies = [ "sha2 0.9.5", "speculoos", "sqlx", - "subprocess", "symphonia", - "tempdir", "time 0.2.26", "tokens", "tokio 1.34.0", "toml", "tts_common", - "twitch_api2", "twitch_common", "twitch_oauth2", "url_config", @@ -6052,10 +6035,7 @@ dependencies = [ name = "storyteller_root" version = "0.0.1" dependencies = [ - "dotenv", - "env_logger 0.10.0", - "errors", - "log", + "my-workspace-hack", "serial_test", "tempdir", ] @@ -6117,12 +6097,6 @@ dependencies = [ "strum_macros 0.24.3", ] -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - [[package]] name = "strum_macros" version = "0.24.3" @@ -6163,8 +6137,7 @@ dependencies = [ name = "subprocess_common" version = "0.0.1" dependencies = [ - "anyhow", - "container_common", + "my-workspace-hack", ] [[package]] @@ -6186,12 +6159,12 @@ dependencies = [ "symphonia-codec-opus", "symphonia-codec-pcm", "symphonia-codec-vorbis", - "symphonia-core 0.5.0", + "symphonia-core", "symphonia-format-isomp4", - "symphonia-format-mkv 0.5.0", + "symphonia-format-mkv", "symphonia-format-ogg", "symphonia-format-wav", - "symphonia-metadata 0.5.0", + "symphonia-metadata", ] [[package]] @@ -6200,9 +6173,9 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", - "symphonia-utils-xiph 0.5.0", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", ] [[package]] @@ -6213,8 +6186,8 @@ dependencies = [ "bitflags 1.3.2", "lazy_static", "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", + "symphonia-core", + "symphonia-metadata", ] [[package]] @@ -6224,7 +6197,7 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "lazy_static", "log", - "symphonia-core 0.5.0", + "symphonia-core", ] [[package]] @@ -6233,7 +6206,7 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", + "symphonia-core", ] [[package]] @@ -6242,7 +6215,7 @@ version = "0.0.1" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", + "symphonia-core", ] [[package]] @@ -6251,7 +6224,7 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", + "symphonia-core", ] [[package]] @@ -6260,8 +6233,8 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", - "symphonia-utils-xiph 0.5.0", + "symphonia-core", + "symphonia-utils-xiph", ] [[package]] @@ -6276,19 +6249,6 @@ dependencies = [ "log", ] -[[package]] -name = "symphonia-core" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "bytemuck", - "lazy_static", - "log", -] - [[package]] name = "symphonia-format-isomp4" version = "0.5.0" @@ -6296,9 +6256,9 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "encoding_rs", "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", - "symphonia-utils-xiph 0.5.0", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", ] [[package]] @@ -6308,22 +6268,9 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "lazy_static", "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", - "symphonia-utils-xiph 0.5.0", -] - -[[package]] -name = "symphonia-format-mkv" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd22f2def8c8f078495ad66111648bfc7d5222ee33774f2077cb665588f3119" -dependencies = [ - "lazy_static", - "log", - "symphonia-core 0.5.2", - "symphonia-metadata 0.5.2", - "symphonia-utils-xiph 0.5.2", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", ] [[package]] @@ -6332,9 +6279,9 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", - "symphonia-utils-xiph 0.5.0", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", ] [[package]] @@ -6343,8 +6290,8 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", + "symphonia-core", + "symphonia-metadata", ] [[package]] @@ -6355,19 +6302,7 @@ dependencies = [ "encoding_rs", "lazy_static", "log", - "symphonia-core 0.5.0", -] - -[[package]] -name = "symphonia-metadata" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e" -dependencies = [ - "encoding_rs", - "lazy_static", - "log", - "symphonia-core 0.5.2", + "symphonia-core", ] [[package]] @@ -6375,18 +6310,8 @@ name = "symphonia-utils-xiph" version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ - "symphonia-core 0.5.0", - "symphonia-metadata 0.5.0", -] - -[[package]] -name = "symphonia-utils-xiph" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b" -dependencies = [ - "symphonia-core 0.5.2", - "symphonia-metadata 0.5.2", + "symphonia-core", + "symphonia-metadata", ] [[package]] @@ -6466,6 +6391,7 @@ name = "testing" version = "0.0.1" dependencies = [ "errors", + "my-workspace-hack", ] [[package]] @@ -6615,14 +6541,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" name = "tokens" version = "0.0.1" dependencies = [ + "my-workspace-hack", "rand 0.8.5", "serde", "serde_derive", - "serde_json", "sqlx", "sqlx-core", - "strum 0.24.1", - "toml", + "strum", ] [[package]] @@ -6632,6 +6557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", + "fnv", "futures-core", "iovec", "lazy_static", @@ -6956,7 +6882,6 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "clap 2.34.0", "cloud_storage", "config", "container_common", @@ -6968,10 +6893,9 @@ dependencies = [ "hostname", "hyper", "jobs_common", - "lfu", "log", + "my-workspace-hack", "mysql_queries", - "newrelic-telemetry", "r2d2_redis", "serde", "serde_derive", @@ -6980,7 +6904,6 @@ dependencies = [ "subprocess", "tempdir", "tokio 1.34.0", - "tts_common", ] [[package]] @@ -7002,6 +6925,7 @@ dependencies = [ "lfu", "log", "memory_caching", + "my-workspace-hack", "mysql_queries", "newrelic-telemetry", "r2d2_redis", @@ -7023,6 +6947,7 @@ dependencies = [ "chrono", "container_common", "log", + "my-workspace-hack", "once_cell", "regex", "serde", @@ -7057,41 +6982,21 @@ dependencies = [ name = "twitch-pubsub-subscriber" version = "0.0.1" dependencies = [ - "actix", - "actix-cors 0.5.4", - "actix-files", - "actix-http 3.4.0", - "actix-rt 2.9.0", - "actix-service 2.0.1", - "actix-utils 3.0.0", - "actix-web 4.0.1", - "actix-web-actors", "anyhow", "base64 0.21.0", - "bcrypt", "chrono", "config", "container_common", - "crossbeam", - "derive_more", "diesel", "dotenv", "easyenv", "futures 0.1.31", "futures 0.3.26", - "futures-timer", "futures-util", - "hex", - "hmac 0.10.1", "hostname", - "http_server_common", "hyper", - "jwt", "lazy_static", - "lfu", - "limitation", "log", - "lru_time_cache", "magic-crypt", "md-5", "mysql_queries", @@ -7102,7 +7007,6 @@ dependencies = [ "redis_common", "regex", "reqwest", - "rpassword", "serde", "serde_derive", "serde_json", @@ -7153,6 +7057,7 @@ dependencies = [ "anyhow", "container_common", "easyenv", + "my-workspace-hack", "once_cell", "regex", "serde", @@ -7295,6 +7200,7 @@ dependencies = [ "actix-web 4.0.1", "anyhow", "http_server_common", + "my-workspace-hack", "reusable_types", ] @@ -7302,9 +7208,7 @@ dependencies = [ name = "user_input_common" version = "0.0.1" dependencies = [ - "anyhow", - "container_common", - "log", + "my-workspace-hack", "once_cell", "pulldown-cmark", "regex", @@ -7333,6 +7237,7 @@ dependencies = [ "lazy_static", "log", "md-5", + "my-workspace-hack", "mysql_queries", "once_cell", "password", @@ -7348,8 +7253,6 @@ dependencies = [ "server_environment", "sha2 0.9.5", "sqlx", - "sqlx_mysql_helpers", - "strum 0.25.0", "strum_macros 0.25.3", "time 0.2.26", "tokens", @@ -7415,7 +7318,6 @@ dependencies = [ "anyhow", "buckets", "chrono", - "clap 2.34.0", "cloud_storage", "config", "container_common", @@ -7426,10 +7328,9 @@ dependencies = [ "hostname", "hyper", "jobs_common", - "lfu", "log", + "my-workspace-hack", "mysql_queries", - "newrelic-telemetry", "r2d2_redis", "serde", "serde_derive", @@ -7438,7 +7339,6 @@ dependencies = [ "subprocess", "tempdir", "tokio 1.34.0", - "tts_common", ] [[package]] @@ -7447,7 +7347,6 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "clap 2.34.0", "cloud_storage", "config", "container_common", @@ -7457,10 +7356,9 @@ dependencies = [ "hostname", "hyper", "jobs_common", - "lfu", "log", + "my-workspace-hack", "mysql_queries", - "newrelic-telemetry", "r2d2_redis", "serde", "serde_derive", @@ -7469,7 +7367,6 @@ dependencies = [ "subprocess", "tempdir", "tokio 1.34.0", - "tts_common", ] [[package]] @@ -7614,6 +7511,7 @@ dependencies = [ "enums", "errors", "log", + "my-workspace-hack", "once_cell", "reqwest", "rss", @@ -7621,8 +7519,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "strum 0.24.1", - "toml", + "strum", ] [[package]] @@ -7659,11 +7556,9 @@ dependencies = [ "actix-web-actors", "anyhow", "base64 0.21.0", - "bcrypt", "chrono", "config", "container_common", - "crossbeam", "derive_more", "diesel", "dotenv", @@ -7671,31 +7566,24 @@ dependencies = [ "errors", "futures 0.1.31", "futures 0.3.26", - "futures-timer", "futures-util", - "hex", - "hmac 0.10.1", "hostname", "http_server_common", "hyper", - "jwt", "lazy_static", - "lfu", "limitation", "log", - "lru_time_cache", "magic-crypt", "md-5", + "my-workspace-hack", "mysql_queries", "native-tls", - "pulldown-cmark", "r2d2_redis", "rand 0.8.5", "redis 0.21.5", "redis_common", "regex", "reqwest", - "rpassword", "serde", "serde_derive", "serde_json", @@ -7703,7 +7591,6 @@ dependencies = [ "sqlx", "time 0.2.26", "tokio 1.34.0", - "tokio-tungstenite", "toml", "twitch_api2", "twitch_common", diff --git a/Cargo.toml b/Cargo.toml index de75c6d0d4..d6b0d5fe79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ # Types: common strongly-typed tokens, ids, payloads, etc. @@ -84,4 +85,7 @@ members = [ # Vendored code "crates/vendor/newrelic-telemetry-sdk-rust", + + # Vendored code + "my-workspace-hack", ] diff --git a/crates/_types/buckets/Cargo.toml b/crates/_types/buckets/Cargo.toml index 7e78465536..e3d3607ed1 100644 --- a/crates/_types/buckets/Cargo.toml +++ b/crates/_types/buckets/Cargo.toml @@ -17,6 +17,7 @@ path = "src/lib.rs" # Internal crockford = { path = "../../lib/crockford" } errors = { path = "../../lib/errors" } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # External # (none yet) diff --git a/crates/_types/enums/Cargo.toml b/crates/_types/enums/Cargo.toml index 9efd7c3148..7b7dbb7dcc 100644 --- a/crates/_types/enums/Cargo.toml +++ b/crates/_types/enums/Cargo.toml @@ -16,8 +16,6 @@ path = "src/lib.rs" # Serialization serde = "1.0.125" serde_derive = "1.0.125" -serde_json = "1.0.64" -toml = "0.5.8" # MySql Database # "offline" supports typesafe builds without a live database @@ -25,6 +23,7 @@ toml = "0.5.8" # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "sqlite", "runtime-actix-native-tls", "offline", "chrono" ] } sqlx-core = { version = "0.6.2" } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] diff --git a/crates/_types/reusable_types/Cargo.toml b/crates/_types/reusable_types/Cargo.toml index 7c0a03d4ad..3edcc80951 100644 --- a/crates/_types/reusable_types/Cargo.toml +++ b/crates/_types/reusable_types/Cargo.toml @@ -18,14 +18,12 @@ path = "src/lib.rs" # (none) # External -anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } # Serialization serde = "1.0.125" serde_derive = "1.0.125" -serde_json = "1.0.64" -toml = "0.5.8" # MySql Database sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/_types/tokens/Cargo.toml b/crates/_types/tokens/Cargo.toml index 1ba311bcb4..9d2de4dc84 100644 --- a/crates/_types/tokens/Cargo.toml +++ b/crates/_types/tokens/Cargo.toml @@ -16,8 +16,6 @@ path = "src/lib.rs" # Serialization serde = "1.0.125" serde_derive = "1.0.125" -serde_json = "1.0.64" -toml = "0.5.8" # Random rand = "0.8.3" @@ -28,6 +26,7 @@ rand = "0.8.3" # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } sqlx-core = { version = "0.6.2" } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] diff --git a/crates/cli/database_backup/Cargo.toml b/crates/cli/database_backup/Cargo.toml index 98af5e1216..3d14de4112 100644 --- a/crates/cli/database_backup/Cargo.toml +++ b/crates/cli/database_backup/Cargo.toml @@ -15,21 +15,17 @@ path = "src/main.rs" [dependencies] # Internal -config = { path = "../../lib/deprecated/config" } container_common = { path = "../../lib/deprecated/container_common" } easyenv = { path = "../../lib/easyenv" } # External anyhow = "1.0.75" -chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated # TODO/NB: Commenting out clap4 as it prevents windows builds # NB: clap4 = { package = "clap", version = "4.0" } dotenv = "0.15.0" -hostname = "0.3.1" log = "0.4.14" # Serialization serde = "1.0.125" serde_derive = "1.0.125" -serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/cli/database_cleanup/Cargo.toml b/crates/cli/database_cleanup/Cargo.toml index 58321cf0ca..d23a8f7f81 100644 --- a/crates/cli/database_cleanup/Cargo.toml +++ b/crates/cli/database_cleanup/Cargo.toml @@ -15,20 +15,17 @@ path = "src/main.rs" [dependencies] # Internal -config = { path = "../../lib/deprecated/config" } container_common = { path = "../../lib/deprecated/container_common" } easyenv = { path = "../../lib/easyenv" } # External anyhow = "1.0.75" -chrono = { version = "0.4.19", features = ["serde"] } # TODO/NB: Commenting out clap4 as it prevents windows builds # clap4 = { package = "clap", version = "4.0" } # TODO/NB: We're using an older version of clap elsewhere, hence the naming. dotenv = "0.15.0" -hostname = "0.3.1" log = "0.4.14" # Serialization serde = "1.0.125" serde_derive = "1.0.125" -serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/cli/dev_database_seed/Cargo.toml b/crates/cli/dev_database_seed/Cargo.toml index c25890a9a7..af623feaef 100644 --- a/crates/cli/dev_database_seed/Cargo.toml +++ b/crates/cli/dev_database_seed/Cargo.toml @@ -43,6 +43,7 @@ tokio = { version = "1.6.0", features = ["macros"] } sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } elasticsearch = "8.5.0-alpha.1" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/cli/dev_upload_media_file/Cargo.toml b/crates/cli/dev_upload_media_file/Cargo.toml index 8d39eb15a4..cc7927fba0 100644 --- a/crates/cli/dev_upload_media_file/Cargo.toml +++ b/crates/cli/dev_upload_media_file/Cargo.toml @@ -21,7 +21,6 @@ easyenv = { path = "../../lib/easyenv" } enums = { path = "../../_types/enums" } errors = { path = "../../lib/errors" } filesys = { path = "../../lib/files/filesys" } -hashing = { path = "../../lib/files/hashing" } mimetypes = { path = "../../lib/files/mimetypes" } mysql_queries = { path = "../../lib/mysql_queries" } tokens = { path = "../../_types/tokens" } @@ -39,6 +38,7 @@ tokio = { version = "1.6.0", features = ["macros"] } # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/cli/elasticsearch-cli/Cargo.toml b/crates/cli/elasticsearch-cli/Cargo.toml index d8d9a0ed49..28cce463e7 100644 --- a/crates/cli/elasticsearch-cli/Cargo.toml +++ b/crates/cli/elasticsearch-cli/Cargo.toml @@ -15,16 +15,11 @@ path = "src/main.rs" [dependencies] # Internal buckets = { path = "../../_types/buckets" } -cloud_storage = { path = "../../lib/api_clients/cloud_storage" } config = { path = "../../lib/deprecated/config" } easyenv = { path = "../../lib/easyenv" } elasticsearch_schema = { path = "../../lib/elasticsearch_schema" } enums = { path = "../../_types/enums" } errors = { path = "../../lib/errors" } -filesys = { path = "../../lib/files/filesys" } -hashing = { path = "../../lib/files/hashing" } -idempotency = { path = "../../lib/idempotency" } -mimetypes = { path = "../../lib/files/mimetypes" } mysql_queries = { path = "../../lib/mysql_queries" } storyteller_root = { path = "../../lib/storyteller_root" } tokens = { path = "../../_types/tokens" } @@ -50,6 +45,7 @@ elasticsearch = "8.5.0-alpha.1" serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/cli/kubectl-pod-cleanup/Cargo.toml b/crates/cli/kubectl-pod-cleanup/Cargo.toml index 9c3723ff48..a4595271a7 100644 --- a/crates/cli/kubectl-pod-cleanup/Cargo.toml +++ b/crates/cli/kubectl-pod-cleanup/Cargo.toml @@ -19,11 +19,11 @@ easyenv = { path = "../../lib/easyenv" } errors = { path = "../../lib/errors" } # External -itertools = "0.11.0" log = "0.4.20" once_cell = "1.18.0" rand = "0.8.1" regex = "1.10.0" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # Async Runtime # NB: Not using Tokio here since everything is blocking so far. diff --git a/crates/cli/lru-delete-models/Cargo.toml b/crates/cli/lru-delete-models/Cargo.toml index 81a24f304d..286c81743c 100644 --- a/crates/cli/lru-delete-models/Cargo.toml +++ b/crates/cli/lru-delete-models/Cargo.toml @@ -14,18 +14,12 @@ path = "src/main.rs" [dependencies] # Internal -easyenv = { path = "../../lib/easyenv" } errors = { path = "../../lib/errors" } -filesys = { path = "../../lib/files/filesys" } logging = { path = "../../lib/logging" } -storyteller_root = { path = "../../lib/storyteller_root" } # External clap = { version = "4.4.7", features = ["derive"] } walkdir = "2.4.0" -# Runtime -tokio = { version = "1.34.0", features = ["macros"] } - [dev-dependencies] # None yet diff --git a/crates/cli/scrape_test/Cargo.toml b/crates/cli/scrape_test/Cargo.toml index 81439ef747..658c01be7d 100644 --- a/crates/cli/scrape_test/Cargo.toml +++ b/crates/cli/scrape_test/Cargo.toml @@ -21,3 +21,4 @@ web_scrapers = { path = "../../lib/web_scrapers" } # External clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated tokio = { version = "1.6.0", features = ["macros"] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/actix_helpers/Cargo.toml b/crates/lib/actix_helpers/Cargo.toml index cb65d76c46..d18274f6c6 100644 --- a/crates/lib/actix_helpers/Cargo.toml +++ b/crates/lib/actix_helpers/Cargo.toml @@ -18,15 +18,11 @@ path = "src/lib.rs" errors = { path = "../../lib/errors" } # Actix -actix-cors = "0.6.0-beta.3" -actix-files= "0.6.0-beta.8" actix-http = "3.4.0" -actix-multipart = "0.4.0-beta.7" actix-rt = "2.9.0" actix-service = "2.0.1" actix-utils = "3.0.0" actix-web = "4.0.0-beta.10" -actix-web-actors = "4.0.0-beta.7" # IPv4 and v6 CIDRs (crate has few dependencies) cidr-utils = "0.5.11" @@ -38,6 +34,7 @@ futures-util = "0.3.29" # Serialization serde = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/api_clients/cloud_storage/Cargo.toml b/crates/lib/api_clients/cloud_storage/Cargo.toml index 3c9a1261c8..888ffabc67 100644 --- a/crates/lib/api_clients/cloud_storage/Cargo.toml +++ b/crates/lib/api_clients/cloud_storage/Cargo.toml @@ -16,7 +16,6 @@ path = "src/lib.rs" # Internal buckets = { path = "../../../_types/buckets" } -container_common = { path = "../../deprecated/container_common" } # External anyhow = "1.0.75" @@ -29,3 +28,4 @@ rust-s3 = { version = "0.33.0" } # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. tokio = { version = "1.6.0", features = ["macros"] } +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/lib/api_clients/google_drive_common/Cargo.toml b/crates/lib/api_clients/google_drive_common/Cargo.toml index f9b94cef36..56abcedc47 100644 --- a/crates/lib/api_clients/google_drive_common/Cargo.toml +++ b/crates/lib/api_clients/google_drive_common/Cargo.toml @@ -22,4 +22,5 @@ subprocess_common = { path = "../../subprocess_common" } anyhow = "1.0.75" log = "0.4.14" tempdir = "0.3.7" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/lib/api_clients/twitch_common/Cargo.toml b/crates/lib/api_clients/twitch_common/Cargo.toml index 20506ccdf5..81fd70e80c 100644 --- a/crates/lib/api_clients/twitch_common/Cargo.toml +++ b/crates/lib/api_clients/twitch_common/Cargo.toml @@ -31,3 +31,4 @@ twitch_oauth2 = "0.6.0-rc.2" # Serialization serde = "1.0.125" serde_derive = "1.0.125" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/lib/bootstrap/Cargo.toml b/crates/lib/bootstrap/Cargo.toml index f09c0b6bbf..556e517ffe 100644 --- a/crates/lib/bootstrap/Cargo.toml +++ b/crates/lib/bootstrap/Cargo.toml @@ -23,6 +23,7 @@ server_environment = { path = "../server_environment" } dotenv = "0.15.0" hostname = "0.3.1" log = "0.4.14" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/caching/memory_caching/Cargo.toml b/crates/lib/caching/memory_caching/Cargo.toml index 3650ac219b..3f541a9647 100644 --- a/crates/lib/caching/memory_caching/Cargo.toml +++ b/crates/lib/caching/memory_caching/Cargo.toml @@ -15,14 +15,11 @@ path = "src/lib.rs" [dependencies] # Internal -config = { path = "../../deprecated/config" } -container_common = { path = "../../deprecated/container_common" } errors = { path = "../../errors" } # External anyhow = "1.0.75" -chrono = { version = "0.4.19", features = ["serde"] } -log = "0.4.14" # In-memory caching lru_time_cache = "0.11.11" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/lib/caching/redis_caching/Cargo.toml b/crates/lib/caching/redis_caching/Cargo.toml index 5313624419..b2d8d36ab2 100644 --- a/crates/lib/caching/redis_caching/Cargo.toml +++ b/crates/lib/caching/redis_caching/Cargo.toml @@ -23,6 +23,7 @@ r2d2_redis = "0.14.0" serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/concurrency/Cargo.toml b/crates/lib/concurrency/Cargo.toml index 18fce4a5ef..0fe7b6d05f 100644 --- a/crates/lib/concurrency/Cargo.toml +++ b/crates/lib/concurrency/Cargo.toml @@ -14,7 +14,7 @@ path = "src/lib.rs" [dependencies] # Internal -errors = { path = "../../lib/errors" } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # External # (None yet) diff --git a/crates/lib/cookies/Cargo.toml b/crates/lib/cookies/Cargo.toml index 6f9678ec57..792b27c484 100644 --- a/crates/lib/cookies/Cargo.toml +++ b/crates/lib/cookies/Cargo.toml @@ -21,6 +21,7 @@ errors = { path = "../errors" } hmac = "0.10.0" # jwt signing jwt = "0.13.0" sha2 = "0.9.5" # hmac signing +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/crockford/Cargo.toml b/crates/lib/crockford/Cargo.toml index 89cea5e711..ca5afa1a35 100644 --- a/crates/lib/crockford/Cargo.toml +++ b/crates/lib/crockford/Cargo.toml @@ -16,6 +16,7 @@ path = "src/lib.rs" [dependencies] rand = "0.8.3" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/datetimes/Cargo.toml b/crates/lib/datetimes/Cargo.toml index fbdb138ae6..0a410bf7bd 100644 --- a/crates/lib/datetimes/Cargo.toml +++ b/crates/lib/datetimes/Cargo.toml @@ -15,6 +15,7 @@ path = "src/lib.rs" [dependencies] chrono = { version = "0.4.19", features = ["serde"] } once_cell = "1.18.0" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # (none) \ No newline at end of file diff --git a/crates/lib/deprecated/config/Cargo.toml b/crates/lib/deprecated/config/Cargo.toml index 9293ceb0c0..f330624014 100644 --- a/crates/lib/deprecated/config/Cargo.toml +++ b/crates/lib/deprecated/config/Cargo.toml @@ -21,3 +21,4 @@ easyenv = { path = "../../../lib/easyenv" } # External anyhow = "1.0.75" url = "2.4.1" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/lib/deprecated/container_common/Cargo.toml b/crates/lib/deprecated/container_common/Cargo.toml index 7492753e95..a2634f9ff4 100644 --- a/crates/lib/deprecated/container_common/Cargo.toml +++ b/crates/lib/deprecated/container_common/Cargo.toml @@ -13,9 +13,6 @@ name = "container_common" path = "src/lib.rs" [dependencies] -# Internal -errors = { path = "../../errors" } -hashing = { path = "../../files/hashing" } # External anyhow = "1.0.75" @@ -26,8 +23,8 @@ log = "0.4.14" # Serialization serde = { version = "1.0.125", features = ["derive"] } -serde_json = "1.0.64" toml = "0.5.8" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] diff --git a/crates/lib/deprecated/http_server_common/Cargo.toml b/crates/lib/deprecated/http_server_common/Cargo.toml index 339ffacb2c..7e92e0ceaa 100644 --- a/crates/lib/deprecated/http_server_common/Cargo.toml +++ b/crates/lib/deprecated/http_server_common/Cargo.toml @@ -15,7 +15,6 @@ path = "src/lib.rs" [dependencies] # Internal -container_common = { path = "../container_common" } errors = { path = "../../errors" } reusable_types = { path = "../../../_types/reusable_types" } @@ -23,7 +22,6 @@ reusable_types = { path = "../../../_types/reusable_types" } anyhow = "1.0.75" base64 = "0.21.0" chrono = { version = "0.4.19", features = ["serde"] } -dotenv = "0.15.0" log = "0.4.14" once_cell = "1.18.0" regex = "1.5.4" @@ -41,7 +39,7 @@ language-tags = "0.3.2" # Parsing single tags richly serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" -toml = "0.5.8" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] actix-rt = "2.9.0" diff --git a/crates/lib/easyenv/Cargo.toml b/crates/lib/easyenv/Cargo.toml index 3746f151bf..a691303c16 100644 --- a/crates/lib/easyenv/Cargo.toml +++ b/crates/lib/easyenv/Cargo.toml @@ -20,6 +20,7 @@ storyteller_root = { path = "../storyteller_root" } dotenv = "0.15.0" env_logger = "0.10.0" log = "0.4.14" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/elasticsearch_schema/Cargo.toml b/crates/lib/elasticsearch_schema/Cargo.toml index 037fb41ccc..f6789eee5e 100644 --- a/crates/lib/elasticsearch_schema/Cargo.toml +++ b/crates/lib/elasticsearch_schema/Cargo.toml @@ -26,6 +26,7 @@ log = "0.4.14" chrono = { version = "0.4.19", features = ["serde"] } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/errors/Cargo.toml b/crates/lib/errors/Cargo.toml index 65cfe584a5..eb50e9efbe 100644 --- a/crates/lib/errors/Cargo.toml +++ b/crates/lib/errors/Cargo.toml @@ -18,6 +18,7 @@ path = "src/lib.rs" # Consider the dependencies here wisely. # Ideally we have almost nothing as a dependency of this crate. anyhow = "1.0.75" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/files/archives/Cargo.toml b/crates/lib/files/archives/Cargo.toml index 5651decbb2..a0c6d9e2d5 100644 --- a/crates/lib/files/archives/Cargo.toml +++ b/crates/lib/files/archives/Cargo.toml @@ -20,6 +20,7 @@ errors = { path = "../../errors" } # External zip = "0.6.6" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/files/filesys/Cargo.toml b/crates/lib/files/filesys/Cargo.toml index 8fb3e5007b..23d984ef53 100644 --- a/crates/lib/files/filesys/Cargo.toml +++ b/crates/lib/files/filesys/Cargo.toml @@ -16,6 +16,7 @@ path = "src/lib.rs" [dependencies] # Internal errors = { path = "../../errors" } +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } # External # KEEP THIS TO A MINIMUM OR NIL. diff --git a/crates/lib/files/hashing/Cargo.toml b/crates/lib/files/hashing/Cargo.toml index c45c9502aa..3099e9f2db 100644 --- a/crates/lib/files/hashing/Cargo.toml +++ b/crates/lib/files/hashing/Cargo.toml @@ -22,6 +22,7 @@ bcrypt = "0.8" # password hashes data-encoding = "2.3.2" md-5 = "0.9.1" # DO NOT USE FOR SERIOUS CRYPTO (we use this for gravatar) ring = "0.17.0-alpha.10" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/files/images/Cargo.toml b/crates/lib/files/images/Cargo.toml index 8fc138ee3d..a3ee93dbaa 100644 --- a/crates/lib/files/images/Cargo.toml +++ b/crates/lib/files/images/Cargo.toml @@ -21,7 +21,7 @@ errors = { path = "../../errors" } # External image = "0.24.1" -log = "0.4.14" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] testing = { path = "../../testing" } diff --git a/crates/lib/files/media/Cargo.toml b/crates/lib/files/media/Cargo.toml index e41974f7df..a099af5003 100644 --- a/crates/lib/files/media/Cargo.toml +++ b/crates/lib/files/media/Cargo.toml @@ -26,8 +26,7 @@ log = "0.4.14" # Opus is the browser's default (only) recording codec: https://blog.addpipe.com/audio-constraints-getusermedia/ symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", rev = "e1a70095c4409478c1ded499fb8dd4afa540fb90", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] } -# symphonia doesn't support mkv/webm containers -symphonia-format-mkv = "0.5.2" # Alternatively, matroska-demuxer = "0.4.0" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/files/mimetypes/Cargo.toml b/crates/lib/files/mimetypes/Cargo.toml index 6c96cfe30e..524b378157 100644 --- a/crates/lib/files/mimetypes/Cargo.toml +++ b/crates/lib/files/mimetypes/Cargo.toml @@ -14,11 +14,9 @@ name = "mimetypes" path = "src/lib.rs" [dependencies] -# Internal -errors = { path = "../../errors" } - # External infer = "0.11" # Mimetype detection +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/idempotency/Cargo.toml b/crates/lib/idempotency/Cargo.toml index f254db4aee..b3d8a69dc1 100644 --- a/crates/lib/idempotency/Cargo.toml +++ b/crates/lib/idempotency/Cargo.toml @@ -19,6 +19,7 @@ path = "src/lib.rs" # External uuid = { version = "0.8.2", features = ["v4"] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/jobs_common/Cargo.toml b/crates/lib/jobs_common/Cargo.toml index 10bad74254..d1c0e8503a 100644 --- a/crates/lib/jobs_common/Cargo.toml +++ b/crates/lib/jobs_common/Cargo.toml @@ -27,4 +27,4 @@ anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } log = "0.4.14" r2d2_redis = "0.14.0" -tempdir = "0.3.7" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/mysql_queries/Cargo.toml b/crates/lib/mysql_queries/Cargo.toml index ff67df7c43..9365a440cc 100644 --- a/crates/lib/mysql_queries/Cargo.toml +++ b/crates/lib/mysql_queries/Cargo.toml @@ -21,12 +21,10 @@ container_common = { path = "../deprecated/container_common" } enums = { path = "../../_types/enums" } errors = { path = "../errors" } reusable_types = { path = "../../_types/reusable_types" } -sqlx_mysql_helpers = { path = "../sqlx_mysql_helpers" } tokens = { path = "../../_types/tokens" } # External anyhow = "1.0.75" -base64 = "0.21.0" chrono = { version = "0.4.19", features = ["serde"] } dotenv = "0.15.0" log = "0.4.14" @@ -46,4 +44,5 @@ toml = "0.5.8" # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/redis_common/Cargo.toml b/crates/lib/redis_common/Cargo.toml index cbc9e344b4..40f7d58b25 100644 --- a/crates/lib/redis_common/Cargo.toml +++ b/crates/lib/redis_common/Cargo.toml @@ -27,3 +27,4 @@ serde_json = "1.0.64" # TODO: Get rid of in favor of std::time time = "0.2.26" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/server_environment/Cargo.toml b/crates/lib/server_environment/Cargo.toml index 82d1767e4b..6bc9d336d7 100644 --- a/crates/lib/server_environment/Cargo.toml +++ b/crates/lib/server_environment/Cargo.toml @@ -14,13 +14,8 @@ name = "server_environment" path = "src/lib.rs" [dependencies] -# Internal -easyenv = { path = "../easyenv" } -errors = { path = "../errors" } - # External -dotenv = "0.15.0" -log = "0.4.14" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/sqlx_mysql_helpers/Cargo.toml b/crates/lib/sqlx_mysql_helpers/Cargo.toml index 25bd486fd3..46f0f655f2 100644 --- a/crates/lib/sqlx_mysql_helpers/Cargo.toml +++ b/crates/lib/sqlx_mysql_helpers/Cargo.toml @@ -21,6 +21,7 @@ errors = { path = "../errors" } # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/lib/storyteller_root/Cargo.toml b/crates/lib/storyteller_root/Cargo.toml index 243fb161ae..d5c5758e14 100644 --- a/crates/lib/storyteller_root/Cargo.toml +++ b/crates/lib/storyteller_root/Cargo.toml @@ -13,13 +13,8 @@ name = "storyteller_root" path = "src/lib.rs" [dependencies] -# Internal -errors = { path = "../errors" } - # External -dotenv = "0.15.0" -env_logger = "0.10.0" -log = "0.4.14" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] serial_test = "2.0.0" diff --git a/crates/lib/subprocess_common/Cargo.toml b/crates/lib/subprocess_common/Cargo.toml index a5897716b5..24548b670f 100644 --- a/crates/lib/subprocess_common/Cargo.toml +++ b/crates/lib/subprocess_common/Cargo.toml @@ -14,11 +14,8 @@ path = "src/lib.rs" [dependencies] -# Internal -container_common = { path = "../deprecated/container_common" } - # External -anyhow = "1.0.75" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # Serialization #serde = "1.0.125" diff --git a/crates/lib/testing/Cargo.toml b/crates/lib/testing/Cargo.toml index 24a2283604..91b58a9597 100644 --- a/crates/lib/testing/Cargo.toml +++ b/crates/lib/testing/Cargo.toml @@ -18,6 +18,7 @@ path = "src/lib.rs" # Internal errors = { path = "../errors" } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # External # None yet diff --git a/crates/lib/tts_common/Cargo.toml b/crates/lib/tts_common/Cargo.toml index 83be11e093..ebaabc39ba 100644 --- a/crates/lib/tts_common/Cargo.toml +++ b/crates/lib/tts_common/Cargo.toml @@ -29,3 +29,4 @@ unicode-segmentation = "1.10.1" # Serialization serde = "1.0.125" serde_derive = "1.0.125" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/url_config/Cargo.toml b/crates/lib/url_config/Cargo.toml index df0ba2edd0..fcf49753dd 100644 --- a/crates/lib/url_config/Cargo.toml +++ b/crates/lib/url_config/Cargo.toml @@ -20,4 +20,5 @@ reusable_types = { path = "../../_types/reusable_types" } # External actix-web = "4.0.0-beta.10" -anyhow = "1.0.75" \ No newline at end of file +anyhow = "1.0.75" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/user_input_common/Cargo.toml b/crates/lib/user_input_common/Cargo.toml index c563dc72d9..2b89e8c730 100644 --- a/crates/lib/user_input_common/Cargo.toml +++ b/crates/lib/user_input_common/Cargo.toml @@ -14,13 +14,9 @@ path = "src/lib.rs" [dependencies] -# Internal -container_common = { path = "../deprecated/container_common" } - # External -anyhow = "1.0.75" -log = "0.4.14" once_cell = "1.18.0" pulldown-cmark = "0.9.3" # Markdown regex = "1.5.4" unicode-segmentation = "1.10.1" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/lib/web_scrapers/Cargo.toml b/crates/lib/web_scrapers/Cargo.toml index 55e97f1322..77b40c64ed 100644 --- a/crates/lib/web_scrapers/Cargo.toml +++ b/crates/lib/web_scrapers/Cargo.toml @@ -28,7 +28,6 @@ strum = { version = "0.24", features = ["derive"] } # Fancy enum iteration, etc. serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" -toml = "0.5.8" # HTTP reqwest = { version = "0.11", features = ["json"] } # HTTP Client @@ -36,6 +35,7 @@ reqwest = { version = "0.11", features = ["json"] } # HTTP Client # Scraping rss = "2.0.2" scraper = "0.17.1" +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] # None yet diff --git a/crates/service/job/analytics_job/Cargo.toml b/crates/service/job/analytics_job/Cargo.toml index c566499148..8d3b13c5f9 100644 --- a/crates/service/job/analytics_job/Cargo.toml +++ b/crates/service/job/analytics_job/Cargo.toml @@ -20,7 +20,6 @@ container_common = { path = "../../../lib/deprecated/container_common" } easyenv = { path = "../../../lib/easyenv" } enums = { path = "../../../_types/enums" } errors = { path = "../../../lib/errors" } -jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../lib/mysql_queries" } reusable_types = { path = "../../../_types/reusable_types" } tokens = { path = "../../../_types/tokens" } @@ -28,7 +27,6 @@ tokens = { path = "../../../_types/tokens" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" log = "0.4.14" @@ -48,3 +46,4 @@ tokio = { version = "1.6.0", features = ["macros"] } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/download_job/Cargo.toml b/crates/service/job/download_job/Cargo.toml index 6cf50484c0..51993d0ad9 100644 --- a/crates/service/job/download_job/Cargo.toml +++ b/crates/service/job/download_job/Cargo.toml @@ -32,18 +32,12 @@ mimetypes = { path = "../../../lib/files/mimetypes" } mysql_queries = { path = "../../../lib/mysql_queries" } reusable_types = { path = "../../../_types/reusable_types" } subprocess_common = { path = "../../../lib/subprocess_common" } -tts_common = { path = "../../../lib/tts_common" } - -# Vendored code -newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" -lfu = "0.2.5" log = "0.4.14" subprocess = "0.2.9" tempdir = "0.3.7" @@ -70,3 +64,4 @@ hyper = { version = "0.14.24" } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/inference_job/Cargo.toml b/crates/service/job/inference_job/Cargo.toml index 919f98df24..f9d4357c3b 100644 --- a/crates/service/job/inference_job/Cargo.toml +++ b/crates/service/job/inference_job/Cargo.toml @@ -35,7 +35,6 @@ mimetypes = { path = "../../../lib/files/mimetypes" } mysql_queries = { path = "../../../lib/mysql_queries" } redis_common = { path = "../../../lib/redis_common" } subprocess_common = { path = "../../../lib/subprocess_common" } -testing = { path = "../../../lib/testing" } tokens = { path = "../../../_types/tokens" } tts_common = { path = "../../../lib/tts_common" } @@ -45,10 +44,8 @@ newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" -lfu = "0.2.5" log = "0.4.14" once_cell = "1.18.0" subprocess = "0.2.9" @@ -84,3 +81,4 @@ serde_json = "1.0.64" # The initial round of stabilizations for the async/await language feature in Rust 1.39 did not # include support for async fn in traits. async-trait = "0.1.58" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/tts_download_job/Cargo.toml b/crates/service/job/tts_download_job/Cargo.toml index 1a04f0ef9c..39cf11af83 100644 --- a/crates/service/job/tts_download_job/Cargo.toml +++ b/crates/service/job/tts_download_job/Cargo.toml @@ -24,18 +24,12 @@ google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../lib/mysql_queries" } -tts_common = { path = "../../../lib/tts_common" } - -# Vendored code -newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" -lfu = "0.2.5" log = "0.4.14" subprocess = "0.2.9" tempdir = "0.3.7" @@ -61,3 +55,4 @@ hyper = { version = "0.14.24" } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/tts_inference_job/Cargo.toml b/crates/service/job/tts_inference_job/Cargo.toml index d2d802c2ac..009907f1d0 100644 --- a/crates/service/job/tts_inference_job/Cargo.toml +++ b/crates/service/job/tts_inference_job/Cargo.toml @@ -60,3 +60,4 @@ hyper = { version = "0.14.24" } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/w2l_download_job/Cargo.toml b/crates/service/job/w2l_download_job/Cargo.toml index 8b2a0d41e3..23599e7831 100644 --- a/crates/service/job/w2l_download_job/Cargo.toml +++ b/crates/service/job/w2l_download_job/Cargo.toml @@ -24,18 +24,12 @@ google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../lib/mysql_queries" } -tts_common = { path = "../../../lib/tts_common" } - -# Vendored code -newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" -lfu = "0.2.5" log = "0.4.14" subprocess = "0.2.9" tempdir = "0.3.7" @@ -61,3 +55,4 @@ hyper = { version = "0.14.24" } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/job/w2l_inference_job/Cargo.toml b/crates/service/job/w2l_inference_job/Cargo.toml index fee8c69bc1..56e141b92a 100644 --- a/crates/service/job/w2l_inference_job/Cargo.toml +++ b/crates/service/job/w2l_inference_job/Cargo.toml @@ -22,18 +22,12 @@ easyenv = { path = "../../../lib/easyenv" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../lib/mysql_queries" } -tts_common = { path = "../../../lib/tts_common" } - -# Vendored code -newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" chrono = { version = "0.4.19", features = ["serde"] } -clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated dotenv = "0.15.0" hostname = "0.3.1" -lfu = "0.2.5" log = "0.4.14" subprocess = "0.2.9" tempdir = "0.3.7" @@ -59,3 +53,4 @@ hyper = { version = "0.14.24" } serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml index c23c9c0bf8..dde64f2fb3 100644 --- a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml +++ b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml @@ -18,7 +18,6 @@ path = "src/main.rs" config = { path = "../../../lib/deprecated/config" } container_common = { path = "../../../lib/deprecated/container_common" } easyenv = { path = "../../../lib/easyenv" } -http_server_common = { path = "../../../lib/deprecated/http_server_common" } mysql_queries = { path = "../../../lib/mysql_queries" } redis_common = { path = "../../../lib/redis_common" } tokens = { path = "../../../_types/tokens" } @@ -29,13 +28,9 @@ twitch_common = { path = "../../../lib/api_clients/twitch_common" } anyhow = "1.0.75" base64 = "0.21.0" chrono = { version = "0.4.19", features = ["serde"] } -derive_more = "0.99.17" dotenv = "0.15.0" -futures-timer = "3.0.2" -hex = "0.4.3" hostname = "0.3.1" lazy_static = "1.4.0" -lfu = "0.2.5" log = "0.4.14" rand = "0.8.3" regex = "1.5.4" @@ -51,8 +46,6 @@ futures = { version = "0.3.17", features = ["thread-pool"] } # feature for Threa futures-util = "0.3.29" futures_old_for_limiter = { package = "futures", version = "0.1.29" } # Older version of futures for `limiter` crate -# Threading -crossbeam = "0.8.1" # MySql Database # "offline" supports typesafe builds without a live database @@ -61,7 +54,6 @@ crossbeam = "0.8.1" sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } # Redis Database -limitation = "0.1.1" # Redis rate limiter r2d2_redis = "0.14.0" # Twitch @@ -73,21 +65,6 @@ twitch_oauth2 = "0.6.0-rc.2" reqwest = { version = "0.11.4" } native-tls = "0.2.8" -# In-memory caching -lru_time_cache = "0.11.11" - -# Web -actix = "0.12.0" -actix-cors = "0.5.4" -actix-files= "0.6.0-beta.8" -actix-http = "3.4.0" -actix-rt = "2.9.0" -actix-service = "2.0.1" -actix-utils = "3.0.0" -actix-web = "4.0.0-beta.10" -actix-web-actors = "4.0.0-beta.7" -jwt = "0.13.0" - # Websockets tokio-tungstenite = { version = "0.15.0", features = ["rustls", "rustls-tls"] } @@ -96,8 +73,6 @@ tokio-tungstenite = { version = "0.15.0", features = ["rustls", "rustls-tls"] } hyper = { version = "0.14.24" } # Crypto -bcrypt = "0.8" # password hashes -hmac = "0.10.0" # cookies magic-crypt = "3.1.8" # encrypting sort IDs for the frontend so we don't leak info md-5 = "0.9.1" # gravatar sha2 = "0.9.5" # file hashes, inference text hashes, etc. @@ -111,9 +86,6 @@ toml = "0.5.8" # Text processing pulldown-cmark = "0.9.3" -# Temporary (just to ask for oauth credentials during dev) -rpassword = "7.2.0" - [build-dependencies] # NB: Only using diesel for migrations support diesel = { version = "2.1.3", features = ["mysql"] } diff --git a/crates/service/plugins/billing/Cargo.toml b/crates/service/plugins/billing/Cargo.toml index b5eb2beb78..89c887f730 100644 --- a/crates/service/plugins/billing/Cargo.toml +++ b/crates/service/plugins/billing/Cargo.toml @@ -42,7 +42,7 @@ serde_json = "1.0.64" toml = "0.5.8" # Money -async-stripe = { version = "0.25.2", features = ["runtime-tokio-hyper"] } +async-stripe = { version = "0.25.2", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } # Async traits # NB: note: `async` trait functions are not currently supported @@ -55,6 +55,7 @@ async-trait = "0.1.58" # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [dev-dependencies] mockall = "0.11.3" diff --git a/crates/service/plugins/inference_workloads/Cargo.toml b/crates/service/plugins/inference_workloads/Cargo.toml index 9b1ca956f9..98243eb9e6 100644 --- a/crates/service/plugins/inference_workloads/Cargo.toml +++ b/crates/service/plugins/inference_workloads/Cargo.toml @@ -14,25 +14,5 @@ path = "src/lib.rs" [dependencies] -# Internal -container_common = { path = "../../../lib/deprecated/container_common" } - # External -anyhow = "1.0.75" -base64 = "0.21.0" -chrono = { version = "0.4.19", features = ["serde"] } -dotenv = "0.15.0" -log = "0.4.14" -once_cell = "1.18.0" -regex = "1.5.4" - -# Web -actix-cors = "0.6.0-beta.3" -actix-http = "3.4.0" -actix-web = "4.0.0-beta.10" - -# Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.64" -toml = "0.5.8" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/plugins/users/Cargo.toml b/crates/service/plugins/users/Cargo.toml index d39f266d46..3572072b94 100644 --- a/crates/service/plugins/users/Cargo.toml +++ b/crates/service/plugins/users/Cargo.toml @@ -28,7 +28,6 @@ redis_caching = { path = "../../../lib/caching/redis_caching" } redis_common = { path = "../../../lib/redis_common" } reusable_types = { path = "../../../_types/reusable_types" } server_environment = { path = "../../../lib/server_environment" } -sqlx_mysql_helpers = { path = "../../../lib/sqlx_mysql_helpers" } tokens = { path = "../../../_types/tokens" } user_input_common = { path = "../../../lib/user_input_common" } @@ -69,5 +68,5 @@ sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "o # Redis Database r2d2_redis = "0.14.0" byteorder = "1.5.0" -strum = "0.25.0" strum_macros = "0.25.3" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } \ No newline at end of file diff --git a/crates/service/web/dummy_service/Cargo.toml b/crates/service/web/dummy_service/Cargo.toml index bd530bcc43..43d424ee60 100644 --- a/crates/service/web/dummy_service/Cargo.toml +++ b/crates/service/web/dummy_service/Cargo.toml @@ -18,7 +18,6 @@ path = "src/main.rs" actix_helpers = { path = "../../../lib/actix_helpers" } easyenv = { path = "../../../lib/easyenv" } errors = { path = "../../../lib/errors" } -http_server_common = { path = "../../../lib/deprecated/http_server_common" } reusable_types = { path = "../../../_types/reusable_types" } # External @@ -33,24 +32,16 @@ hostname = "0.3.1" tokio = { version = "1.6.0", features = ["macros"] } # Futures -futures = { version = "0.3.17", features = ["thread-pool"] } # feature for ThreadPool futures-util = "0.3.29" -futures_old_for_limiter = { package = "futures", version = "0.1.29" } # Older version of futures for `limiter` crate # Web -actix-cors = "0.6.0-beta.3" -actix-files= "0.6.0-beta.8" actix-http = "3.4.0" -actix-multipart = "0.4.0-beta.7" actix-rt = "2.9.0" actix-service = "2.0.1" actix-utils = "3.0.0" actix-web = "4.0.0-beta.10" -actix-web-actors = "4.0.0-beta.7" -jwt = "0.13.0" # Serialization serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" -toml = "0.5.8" diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 16af3e0a8d..b3efde306d 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -32,7 +32,6 @@ errors = { path = "../../../lib/errors" } google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } -jobs_common = { path = "../../../lib/jobs_common" } media = { path = "../../../lib/files/media" } memory_caching = { path = "../../../lib/caching/memory_caching" } mimetypes = { path = "../../../lib/files/mimetypes" } @@ -51,8 +50,6 @@ user_input_common = { path = "../../../lib/user_input_common" } billing_component = { path = "../../plugins/billing" } users_component = { path = "../../plugins/users" } -# Vendored code -newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" } # External anyhow = "1.0.75" @@ -64,7 +61,6 @@ hex = "0.4.3" hostname = "0.3.1" lazy_static = "1.4.0" lexical-sort = "0.3.1" -lfu = "0.2.5" log = "0.4.14" once_cell = "1.18.0" rand = "0.8.3" @@ -79,7 +75,6 @@ uuid = { version = "0.8.2", features = ["v4"] } # TODO/TEMPORARY: # Twitch # NB: "unsupported" pubsub features may disappear from the Twitch API at any time. It's an unofficial API. -twitch_api2 = { version = "0.6.0-rc.2", features = ["helix", "reqwest_client", "pubsub", "chrono", "unsupported"] } twitch_oauth2 = "0.6.0-rc.2" # Language tag parsing @@ -127,18 +122,13 @@ infer = "0.5.0" # https://github.com/durch/rust-s3/pull/254 rust-s3 = { version = "0.33.0" } -subprocess = "0.2.9" -tempdir = "0.3.7" - actix-cors = "0.6.0-beta.3" -actix-files= "0.6.0-beta.8" actix-http = "3.4.0" actix-multipart = "0.4.0-beta.7" actix-rt = "2.9.0" actix-service = "2.0.1" actix-utils = "3.0.0" actix-web = "4.0.0-beta.10" -actix-web-actors = "4.0.0-beta.7" jwt = "0.13.0" # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime @@ -146,7 +136,7 @@ jwt = "0.13.0" hyper = { version = "0.14.24" } # Money -async-stripe = { version = "0.25.2", features = ["runtime-tokio-hyper"] } +async-stripe = { version = "0.25.2", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } # Crypto bcrypt = "0.8" # password hashes diff --git a/crates/service/web/websocket_gateway/Cargo.toml b/crates/service/web/websocket_gateway/Cargo.toml index fa6951f0bb..37d8298d08 100644 --- a/crates/service/web/websocket_gateway/Cargo.toml +++ b/crates/service/web/websocket_gateway/Cargo.toml @@ -30,11 +30,8 @@ base64 = "0.21.0" chrono = { version = "0.4.19", features = ["serde"] } derive_more = "0.99.17" dotenv = "0.15.0" -futures-timer = "3.0.2" -hex = "0.4.3" hostname = "0.3.1" lazy_static = "1.4.0" -lfu = "0.2.5" log = "0.4.14" rand = "0.8.3" regex = "1.5.4" @@ -50,9 +47,6 @@ futures = { version = "0.3.17", features = ["thread-pool"] } # feature for Threa futures-util = "0.3.29" futures_old_for_limiter = { package = "futures", version = "0.1.29" } # Older version of futures for `limiter` crate -# Threading -crossbeam = "0.8.1" - # MySql Database # "offline" supports typesafe builds without a live database # "rustls" doesn't appear to work with IP addresses, per: @@ -73,9 +67,6 @@ twitch_oauth2 = "0.6.0-rc.2" reqwest = { version = "0.11.4" } native-tls = "0.2.8" -# In-memory caching -lru_time_cache = "0.11.11" - # Web actix = "0.12.0" actix-cors = "0.5.4" @@ -86,18 +77,12 @@ actix-service = "2.0.1" actix-utils = "3.0.0" actix-web = "4.0.0-beta.10" actix-web-actors = "4.0.0-beta.7" -jwt = "0.13.0" - -# Websockets -tokio-tungstenite = { version = "0.15.0", features = ["rustls", "rustls-tls"] } # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "0.14.24" } # Crypto -bcrypt = "0.8" # password hashes -hmac = "0.10.0" # cookies magic-crypt = "3.1.8" # encrypting sort IDs for the frontend so we don't leak info md-5 = "0.9.1" # gravatar sha2 = "0.9.5" # file hashes, inference text hashes, etc. @@ -108,11 +93,8 @@ serde_derive = "1.0.125" serde_json = "1.0.64" toml = "0.5.8" -# Text processing -pulldown-cmark = "0.9.3" - # Temporary (just to ask for oauth credentials during dev) -rpassword = "7.2.0" +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } [build-dependencies] # NB: Only using diesel for migrations support diff --git a/crates/vendor/newrelic-telemetry-sdk-rust/Cargo.toml b/crates/vendor/newrelic-telemetry-sdk-rust/Cargo.toml index 06de16361c..707fe1007b 100644 --- a/crates/vendor/newrelic-telemetry-sdk-rust/Cargo.toml +++ b/crates/vendor/newrelic-telemetry-sdk-rust/Cargo.toml @@ -21,6 +21,7 @@ flate2 = { version = "1.0.16", optional = true } futures = { version = "0.3.1", optional = true } tokio = { version = "1.1.0", features = ["macros"], optional = true } uuid = { version = "0.8.1", features = ["v4"] } +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } [dev-dependencies] rand = "0.7.3"