diff --git a/Cargo.lock b/Cargo.lock index 1bc6f7b529..b33ea23807 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1096,7 +1096,6 @@ name = "bucket_paths" version = "0.0.1" dependencies = [ "crockford", - "errors", "my-workspace-hack", ] @@ -2552,7 +2551,6 @@ name = "enums_public" version = "0.0.1" dependencies = [ "enums", - "errors", "my-workspace-hack", "serde", "serde_derive", @@ -4561,6 +4559,7 @@ dependencies = [ "hmac 0.12.1", "hyper 0.14.28", "hyper 1.3.1", + "hyper-util", "indexmap 2.2.6", "itertools 0.12.1", "lazy_static", @@ -4579,7 +4578,6 @@ dependencies = [ "openssl", "openssl-sys", "proc-macro2", - "quick-xml 0.30.0", "quote", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4588,6 +4586,7 @@ dependencies = [ "regex-automata", "regex-syntax", "reqwest 0.12.7", + "rsa", "rustls-pki-types", "semver 1.0.23", "serde", @@ -4604,12 +4603,14 @@ dependencies = [ "sqlx-macros-core", "sqlx-mysql", "sqlx-sqlite", + "subtle", "syn 1.0.109", "syn 2.0.66", "time", "time-macros", "tokio", "tokio-stream", + "tokio-util", "tower", "tracing", "unicode-bidi", @@ -4631,7 +4632,6 @@ dependencies = [ "bucket_paths", "chrono", "composite_identifiers", - "dotenv", "enums", "errors", "idempotency", @@ -4650,7 +4650,6 @@ dependencies = [ "sqlx", "tokens", "tokio", - "toml 0.8.14", ] [[package]] @@ -5534,7 +5533,6 @@ checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "encoding_rs", "memchr", - "serde", ] [[package]] @@ -8356,7 +8354,6 @@ version = "0.0.1" dependencies = [ "my-workspace-hack", "once_cell", - "pulldown-cmark 0.11.0", "regex", "unicode-segmentation", ] @@ -8487,7 +8484,6 @@ dependencies = [ "log", "mp4", "my-workspace-hack", - "regex", "testing", ] diff --git a/crates/_types/enums_public/Cargo.toml b/crates/_types/enums_public/Cargo.toml index aeb3fe16d8..1fe49d8de9 100644 --- a/crates/_types/enums_public/Cargo.toml +++ b/crates/_types/enums_public/Cargo.toml @@ -16,13 +16,12 @@ path = "src/lib.rs" normal = ["my-workspace-hack"] [dependencies] -# Internal -enums = { path = "../enums" } -errors = { path = "../../lib/errors" } - # Workspace hack (faster compile times) my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" } +# Internal +enums = { path = "../enums" } + # Serialization serde = "1.0.125" serde_derive = "1.0.125" diff --git a/crates/lib/bucket_paths/Cargo.toml b/crates/lib/bucket_paths/Cargo.toml index 9295668a8c..ad4b3739af 100644 --- a/crates/lib/bucket_paths/Cargo.toml +++ b/crates/lib/bucket_paths/Cargo.toml @@ -21,7 +21,6 @@ my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" } # Internal crockford = { path = "../data/crockford" } -errors = { path = "../errors" } # External # (None yet) diff --git a/crates/lib/files/videos/Cargo.toml b/crates/lib/files/videos/Cargo.toml index b01f6e7f64..323a8facba 100644 --- a/crates/lib/files/videos/Cargo.toml +++ b/crates/lib/files/videos/Cargo.toml @@ -17,20 +17,18 @@ path = "src/lib.rs" normal = ["my-workspace-hack"] [dependencies] +# Workspace hack (faster compile times) +my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } # Internal errors = { path = "../../errors" } -# Workspace hack (faster compile times) -my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } - # External ffprobe = "0.4.0" log = "0.4.20" # TODO(bt,2024-08-08): We might drop `mp4` crate because it crashes on reading # some videos with the message "avcc not found" mp4 = "0.14.0" -regex = "1.10.5" [dev-dependencies] testing = { path = "../../testing" } diff --git a/crates/lib/mysql_queries/Cargo.toml b/crates/lib/mysql_queries/Cargo.toml index 2956388b78..9b75cdc681 100644 --- a/crates/lib/mysql_queries/Cargo.toml +++ b/crates/lib/mysql_queries/Cargo.toml @@ -33,7 +33,6 @@ my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" } # External anyhow = "1.0.86" chrono = { version = "0.4.22", features = ["serde"] } -dotenv = "0.15.0" log = "0.4.14" # Needed to safety check some queries we can't use escaping for @@ -44,7 +43,6 @@ regex = "1.5.4" serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.108" -toml = "0.8.14" serial_test = "3.0.0" # BigNum diff --git a/crates/lib/user_input_common/Cargo.toml b/crates/lib/user_input_common/Cargo.toml index 7cf81ce599..1b8b9e93cb 100644 --- a/crates/lib/user_input_common/Cargo.toml +++ b/crates/lib/user_input_common/Cargo.toml @@ -21,6 +21,5 @@ my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" } # External once_cell = "1.18.0" -pulldown-cmark = "0.11.0" # Markdown regex = "1.5.4" unicode-segmentation = "1.10.1" diff --git a/crates/my-workspace-hack/Cargo.toml b/crates/my-workspace-hack/Cargo.toml index 98d09ad6e0..996076aec5 100644 --- a/crates/my-workspace-hack/Cargo.toml +++ b/crates/my-workspace-hack/Cargo.toml @@ -42,8 +42,8 @@ futures-io = { version = "0.3.30" } futures-sink = { version = "0.3.30" } futures-task = { version = "0.3.30", default-features = false, features = ["std"] } futures-util = { version = "0.3.30", features = ["channel", "io", "sink"] } -generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } -getrandom = { version = "0.2.14", default-features = false, features = ["std"] } +generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] } +getrandom = { version = "0.2.14", default-features = false, features = ["js", "std"] } hashbrown = { version = "0.14.5", features = ["raw"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] } @@ -58,12 +58,11 @@ miniz_oxide = { version = "0.7.2", features = ["simd"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } num-bigint = { version = "0.4.4" } -num-integer = { version = "0.1.45", default-features = false, features = ["i128", "std"] } +num-integer = { version = "0.1.45", features = ["i128"] } num-iter = { version = "0.1.43", default-features = false, features = ["i128", "std"] } num-rational = { version = "0.4.1", features = ["serde"] } num-traits = { version = "0.2.19", features = ["i128", "libm"] } proc-macro2 = { version = "1.0.85", features = ["span-locations"] } -quick-xml = { version = "0.30.0", features = ["encoding", "serialize"] } quote = { version = "1.0.36" } rand = { version = "0.8.5", features = ["small_rng"] } rand_chacha = { version = "0.3.1" } @@ -71,19 +70,21 @@ rand_core = { version = "0.6.4", default-features = false, features = ["std"] } regex = { version = "1.10.5" } regex-automata = { version = "0.4.7", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } regex-syntax = { version = "0.8.4" } -reqwest = { version = "0.12.4", features = ["blocking", "json", "rustls-tls"] } +reqwest = { version = "0.12.7", features = ["blocking", "json", "native-tls", "rustls-tls", "stream"] } +rsa = { version = "0.9.6", features = ["getrandom", "hazmat", "sha2"] } semver = { version = "1.0.23", features = ["serde"] } -serde = { version = "1.0.203", features = ["alloc", "derive", "rc"] } -serde_json = { version = "1.0.117", features = ["preserve_order", "raw_value"] } +serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] } +serde_json = { version = "1.0.128", features = ["preserve_order", "raw_value"] } sha1 = { version = "0.10.6" } -sha2 = { version = "0.10.8" } +sha2 = { version = "0.10.8", features = ["oid"] } simd-adler32 = { version = "0.3.7" } smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] } socket2 = { version = "0.5.7", default-features = false, features = ["all"] } -sqlx = { version = "0.7.3", features = ["chrono", "mysql", "runtime-tokio-native-tls", "sqlite", "tls-rustls"] } -sqlx-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "any", "chrono", "json", "migrate", "offline"] } -sqlx-mysql = { version = "0.7.3", default-features = false, features = ["any", "chrono", "json", "migrate", "offline"] } +sqlx = { version = "0.7.3", features = ["bigdecimal", "chrono", "mysql", "runtime-tokio-native-tls", "sqlite", "tls-rustls"] } +sqlx-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "any", "bigdecimal", "chrono", "json", "migrate", "offline"] } +sqlx-mysql = { version = "0.7.3", default-features = false, features = ["any", "bigdecimal", "chrono", "json", "migrate", "offline"] } sqlx-sqlite = { version = "0.7.3", default-features = false, features = ["any", "chrono", "json", "migrate", "offline"] } +subtle = { version = "2.5.0", default-features = false, features = ["i128"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.66", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.36", features = ["macros", "serde-well-known"] } tokio = { version = "1.38.0", features = ["full"] } @@ -119,8 +120,8 @@ futures-io = { version = "0.3.30" } futures-sink = { version = "0.3.30" } futures-task = { version = "0.3.30", default-features = false, features = ["std"] } futures-util = { version = "0.3.30", features = ["channel", "io", "sink"] } -generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } -getrandom = { version = "0.2.14", default-features = false, features = ["std"] } +generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] } +getrandom = { version = "0.2.14", default-features = false, features = ["js", "std"] } hashbrown = { version = "0.14.5", features = ["raw"] } heck = { version = "0.4.1", features = ["unicode"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } @@ -133,7 +134,8 @@ memchr = { version = "2.7.4", features = ["use_std"] } miniz_oxide = { version = "0.7.2", features = ["simd"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } -num-integer = { version = "0.1.45", default-features = false, features = ["i128", "std"] } +num-bigint = { version = "0.4.4" } +num-integer = { version = "0.1.45", features = ["i128"] } num-iter = { version = "0.1.43", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2.19", features = ["i128", "libm"] } proc-macro2 = { version = "1.0.85", features = ["span-locations"] } @@ -144,18 +146,20 @@ rand_core = { version = "0.6.4", default-features = false, features = ["std"] } regex = { version = "1.10.5" } regex-automata = { version = "0.4.7", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } regex-syntax = { version = "0.8.4" } +rsa = { version = "0.9.6", features = ["getrandom", "hazmat", "sha2"] } semver = { version = "1.0.23", features = ["serde"] } -serde = { version = "1.0.203", features = ["alloc", "derive", "rc"] } -serde_json = { version = "1.0.117", features = ["preserve_order", "raw_value"] } +serde = { version = "1.0.210", features = ["alloc", "derive", "rc"] } +serde_json = { version = "1.0.128", features = ["preserve_order", "raw_value"] } sha1 = { version = "0.10.6" } -sha2 = { version = "0.10.8" } +sha2 = { version = "0.10.8", features = ["oid"] } simd-adler32 = { version = "0.3.7" } smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] } -sqlx-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "any", "chrono", "json", "migrate", "offline"] } -sqlx-macros = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "chrono", "json", "migrate", "mysql", "sqlite"] } -sqlx-macros-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "chrono", "json", "migrate", "mysql", "sqlite"] } -sqlx-mysql = { version = "0.7.3", default-features = false, features = ["any", "chrono", "json", "migrate", "offline"] } +sqlx-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "any", "bigdecimal", "chrono", "json", "migrate", "offline"] } +sqlx-macros = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "bigdecimal", "chrono", "json", "migrate", "mysql", "sqlite"] } +sqlx-macros-core = { version = "0.7.3", features = ["_rt-tokio", "_tls-native-tls", "_tls-rustls", "bigdecimal", "chrono", "json", "migrate", "mysql", "sqlite"] } +sqlx-mysql = { version = "0.7.3", default-features = false, features = ["any", "bigdecimal", "chrono", "json", "migrate", "offline"] } sqlx-sqlite = { version = "0.7.3", default-features = false, features = ["any", "chrono", "json", "migrate", "offline"] } +subtle = { version = "2.5.0", default-features = false, features = ["i128"] } syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit-mut"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.66", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing", "serde"] } @@ -169,10 +173,12 @@ zeroize = { version = "1.8.1", features = ["zeroize_derive"] } [target.x86_64-unknown-linux-gnu.dependencies] hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2"] } +hyper-util = { version = "0.1.5", features = ["client-legacy", "http1", "http2"] } openssl = { version = "0.10.64", features = ["vendored"] } openssl-sys = { version = "0.9.102", default-features = false, features = ["vendored"] } rustls-pki-types = { version = "1.7.0", features = ["std"] } spin = { version = "0.9.8" } +tokio-util = { version = "0.7.10", features = ["codec", "io"] } tower = { version = "0.4.13", default-features = false, features = ["balance", "buffer", "limit", "timeout", "util"] } [target.x86_64-unknown-linux-gnu.build-dependencies] @@ -184,8 +190,10 @@ spin = { version = "0.9.8" } [target.x86_64-apple-darwin.dependencies] hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2"] } +hyper-util = { version = "0.1.5", features = ["client-legacy", "http1", "http2"] } rustls-pki-types = { version = "1.7.0", features = ["std"] } spin = { version = "0.9.8" } +tokio-util = { version = "0.7.10", features = ["codec", "io"] } tower = { version = "0.4.13", default-features = false, features = ["balance", "buffer", "limit", "timeout", "util"] } [target.x86_64-apple-darwin.build-dependencies] @@ -195,8 +203,10 @@ spin = { version = "0.9.8" } [target.x86_64-pc-windows-msvc.dependencies] hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2"] } +hyper-util = { version = "0.1.5", features = ["client-legacy", "http1", "http2"] } rustls-pki-types = { version = "1.7.0", features = ["std"] } spin = { version = "0.9.8" } +tokio-util = { version = "0.7.10", features = ["codec", "io"] } tower = { version = "0.4.13", default-features = false, features = ["balance", "buffer", "limit", "timeout", "util"] } winapi = { version = "0.3.9", default-features = false, features = ["consoleapi", "errhandlingapi", "fibersapi", "fileapi", "handleapi", "memoryapi", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "processenv", "processthreadsapi", "profileapi", "std", "synchapi", "sysinfoapi", "winbase", "wincon", "winerror", "winnt", "winsock2", "ws2def", "ws2ipdef", "ws2tcpip"] } windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52.0", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Threading", "Win32_System_WindowsProgramming"] } @@ -204,10 +214,12 @@ windows-sys-c8eced492e86ede7 = { package = "windows-sys", version = "0.48.0", fe [target.x86_64-pc-windows-msvc.build-dependencies] hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2"] } -reqwest = { version = "0.12.4", features = ["blocking", "json", "rustls-tls"] } +hyper-util = { version = "0.1.5", features = ["client-legacy", "http1", "http2"] } +reqwest = { version = "0.12.7", features = ["blocking", "json", "native-tls", "rustls-tls", "stream"] } rustls-pki-types = { version = "1.7.0", features = ["std"] } socket2 = { version = "0.5.7", default-features = false, features = ["all"] } spin = { version = "0.9.8" } +tokio-util = { version = "0.7.10", features = ["codec", "io"] } tower = { version = "0.4.13", default-features = false, features = ["balance", "buffer", "limit", "timeout", "util"] } winapi = { version = "0.3.9", default-features = false, features = ["consoleapi", "errhandlingapi", "fibersapi", "fileapi", "handleapi", "memoryapi", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "processenv", "processthreadsapi", "profileapi", "std", "synchapi", "sysinfoapi", "winbase", "wincon", "winerror", "winnt", "winsock2", "ws2def", "ws2ipdef", "ws2tcpip"] } windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52.0", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Threading", "Win32_System_WindowsProgramming"] }