diff --git a/Cargo.lock b/Cargo.lock index d179efe5..b5ed40b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom 0.2.16", "once_cell", "version_check", "zerocopy 0.7.32", @@ -236,9 +237,9 @@ dependencies = [ [[package]] name = "async-compat" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" +checksum = "a1ba85bc55464dcbf728b56d97e119d673f4cf9062be330a9a26f3acf504a590" dependencies = [ "futures-core", "futures-io", @@ -619,9 +620,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytecheck" @@ -630,7 +631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", - "ptr_meta", + "ptr_meta 0.1.4", "simdutf8", ] @@ -683,9 +684,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -810,7 +811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1103,7 +1104,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1253,15 +1268,15 @@ dependencies = [ "tracing-log", "tracing-stackdriver", "tracing-subscriber", - "trillium", + "trillium 0.2.20", "trillium-api", - "trillium-client", - "trillium-http", + "trillium-client 0.6.2", + "trillium-http 0.3.17", "trillium-logger", "trillium-macros 0.0.6", "trillium-router", - "trillium-rustls", - "trillium-testing", + "trillium-rustls 0.9.0", + "trillium-testing 0.7.0", "trillium-tokio", "typenum", "url", @@ -1322,9 +1337,9 @@ dependencies = [ "thiserror 2.0.18", "time", "tokio", - "trillium", - "trillium-http", - "trillium-testing", + "trillium 1.1.0", + "trillium-http 1.2.2", + "trillium-testing 0.9.0", "trillium-tokio", "url", "uuid", @@ -1498,6 +1513,18 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +[[package]] +name = "faststr" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d44d22004409a61c393afb3369c8f7bb74abcae49fe249ee01dcc3002113" +dependencies = [ + "bytes", + "rkyv 0.8.16", + "serde", + "simdutf8", +] + [[package]] name = "ff" version = "0.13.0" @@ -1514,6 +1541,26 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[package]] +name = "fieldwork" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b5ff57d22899405076c15dd38c2735eb8ff261a37fd0d1b0e841f3fd298433" +dependencies = [ + "fieldwork-derive", +] + +[[package]] +name = "fieldwork-derive" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9aca8417ff665ef605a5d6f8f7670df33f74f3226003a1021582940878730b3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "find-msvc-tools" version = "0.1.4" @@ -1571,6 +1618,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -1856,9 +1909,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1872,7 +1925,18 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", ] [[package]] @@ -2305,7 +2369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2447,7 +2511,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tracing", - "trillium", + "trillium 0.2.20", "url", ] @@ -2590,6 +2654,17 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "listenfd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87bc54a4629b4294d0b3ef041b64c40c611097a677d9dc07b2c67739fe39dba" +dependencies = [ + "libc", + "uuid", + "winapi", +] + [[package]] name = "litemap" version = "0.7.3" @@ -2598,11 +2673,10 @@ checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] @@ -2745,6 +2819,26 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "munge" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e17401f259eba956ca16491461b6e8f72913a0a114e39736ce404410f915a0c" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "nix" version = "0.29.0" @@ -2915,9 +3009,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" @@ -3105,15 +3199,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", - "windows-targets 0.48.5", + "windows-link 0.2.1", ] [[package]] @@ -3473,7 +3567,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "ptr_meta_derive", + "ptr_meta_derive 0.1.4", +] + +[[package]] +name = "ptr_meta" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9a0cf95a1196af61d4f1cbdab967179516d9a4a4312af1f31948f8f6224a79" +dependencies = [ + "ptr_meta_derive 0.3.1", ] [[package]] @@ -3487,6 +3590,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ptr_meta_derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "querystrong" version = "0.4.0" @@ -3563,6 +3677,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rancor" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a063ea72381527c2a0561da9c80000ef822bdd7c3241b1cc1b12100e3df081ee" +dependencies = [ + "ptr_meta 0.3.1", +] + [[package]] name = "rand" version = "0.8.5" @@ -3647,6 +3770,35 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.11.0", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "regex" version = "1.12.3" @@ -3685,6 +3837,12 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "rend" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadadef317c2f20755a64d7fdc48f9e7178ee6b0e1f7fce33fa60f1d68a276e6" + [[package]] name = "reqwest" version = "0.12.15" @@ -3763,14 +3921,32 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", + "ptr_meta 0.1.4", + "rend 0.4.1", + "rkyv_derive 0.7.43", "seahash", "tinyvec", "uuid", ] +[[package]] +name = "rkyv" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73389e0c99e664f919275ab5b5b0471391fe9a8de61e1dff9b1eaf56a90f16e3" +dependencies = [ + "bytes", + "hashbrown 0.17.1", + "indexmap 2.2.1", + "munge", + "ptr_meta 0.3.1", + "rancor", + "rend 0.5.3", + "rkyv_derive 0.8.16", + "tinyvec", + "uuid", +] + [[package]] name = "rkyv_derive" version = "0.7.43" @@ -3782,6 +3958,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rkyv_derive" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2ed0b54125315fb36bd021e82d314d1c126548f871634b483f46b31d13cac6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "rlimit" version = "0.10.1" @@ -3791,6 +3978,15 @@ dependencies = [ "libc", ] +[[package]] +name = "rlimit" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3" +dependencies = [ + "libc", +] + [[package]] name = "routefinder" version = "0.5.4" @@ -3833,7 +4029,7 @@ dependencies = [ "bytes", "num-traits", "rand 0.8.5", - "rkyv", + "rkyv 0.7.43", "serde", "serde_json", ] @@ -4337,9 +4533,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" -version = "0.3.17" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "b2a0c28ca5908dbdbcd52e6fdaa00358ab88637f8ab33e1f188dd510eb44b53d" dependencies = [ "libc", "signal-hook-registry", @@ -4356,9 +4552,9 @@ dependencies = [ [[package]] name = "signal-hook-tokio" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" +checksum = "e513e435a8898a0002270f29d0a708b7879708fb5c4d00e46983ca2d2d378cf0" dependencies = [ "futures-core", "libc", @@ -4388,6 +4584,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fed904c7fb2856d868b92464fc8fa597fce366edea1a9cbfaa8cb5fe080bd6d" +[[package]] +name = "size" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6709c7b6754dca1311b3c73e79fcce40dd414c782c66d88e8823030093b02b" + [[package]] name = "slab" version = "0.4.9" @@ -4446,6 +4648,45 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "sonic-number" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3775c3390edf958191f1ab1e8c5c188907feebd0f3ce1604cb621f72961dbf32" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "sonic-rs" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d971cc77a245ccf1756dbd1a87c3e7f709c0191464096510d43eec056d0f2c4f" +dependencies = [ + "ahash 0.8.11", + "bumpalo", + "bytes", + "cfg-if", + "faststr", + "itoa", + "ref-cast", + "serde", + "simdutf8", + "sonic-number", + "sonic-simd", + "thiserror 2.0.18", + "zmij", +] + +[[package]] +name = "sonic-simd" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f99e664ecd2d85a68c87e3c7a3cfe691f647ea9e835de984aba4d54a41f817d4" +dependencies = [ + "cfg-if", +] + [[package]] name = "spin" version = "0.5.2" @@ -4738,6 +4979,18 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "swansong" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e547d6edfcd09568f663d6340c48478cec8cac1403db95e8072c9a7e513253" +dependencies = [ + "event-listener 5.4.1", + "futures-core", + "log", + "pin-project-lite", +] + [[package]] name = "syn" version = "1.0.109" @@ -4836,12 +5089,12 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "trillium", - "trillium-client", - "trillium-http", - "trillium-macros 0.0.6", - "trillium-rustls", - "trillium-testing", + "trillium 1.1.0", + "trillium-client 0.6.2", + "trillium-http 1.2.2", + "trillium-macros 0.1.0", + "trillium-rustls 0.11.1", + "trillium-testing 0.9.0", "trillium-tokio", "url", "uuid", @@ -4997,9 +5250,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -5361,7 +5614,19 @@ checksum = "b84b5b14b3b2dda42a660fd7476a00f25c7565c4f1dc63b4322a7855a1c5384f" dependencies = [ "async-trait", "log", - "trillium-http", + "trillium-http 0.3.17", +] + +[[package]] +name = "trillium" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42555814b00d06d4e3ea4dc1ee1929cfab2d776512b8850a907da51393ef9bc7" +dependencies = [ + "futures-lite", + "log", + "trillium-http 1.2.2", + "trillium-macros 0.1.0", ] [[package]] @@ -5376,7 +5641,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "thiserror 1.0.69", - "trillium", + "trillium 0.2.20", "trillium-macros 0.0.6", ] @@ -5387,7 +5652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6977db194636278cb7b7397887066885e35a040c7e16312c10e29780372a6c5" dependencies = [ "crossbeam-queue", - "dashmap", + "dashmap 5.5.3", "encoding_rs", "futures-lite", "httparse", @@ -5396,10 +5661,31 @@ dependencies = [ "mime", "serde", "serde_json", - "size", + "size 0.4.1", "thiserror 1.0.69", - "trillium-http", - "trillium-server-common", + "trillium-http 0.3.17", + "trillium-server-common 0.5.2", +] + +[[package]] +name = "trillium-client" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5f50f8cc598c9bee0b7066738e9270e0510e5a769aa5295ec698147a704112" +dependencies = [ + "crossbeam-queue", + "dashmap 6.2.1", + "encoding_rs", + "fieldwork", + "futures-lite", + "httparse", + "log", + "memchr", + "mime", + "size 0.5.0", + "trillium-http 1.2.2", + "trillium-macros 0.1.0", + "trillium-server-common 0.7.2", ] [[package]] @@ -5410,7 +5696,7 @@ checksum = "dd4c063660875422d9f85a334931963fc301a3ede9a5c39de7c968ab0801ce33" dependencies = [ "encoding_rs", "futures-lite", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "http", "httparse", "httpdate", @@ -5426,6 +5712,35 @@ dependencies = [ "trillium-macros 0.0.6", ] +[[package]] +name = "trillium-http" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd0e13333ef1b74582d8b22188041d6708033a2fbcf8a61afceead552da70c" +dependencies = [ + "atomic-waker", + "encoding_rs", + "event-listener 5.4.1", + "fastrand", + "fieldwork", + "futures-lite", + "hashbrown 0.17.1", + "httparse", + "httpdate", + "log", + "memchr", + "mime", + "pin-project-lite", + "smallvec", + "smartcow", + "smartstring", + "swansong", + "sync_wrapper 1.0.2", + "thiserror 2.0.18", + "trillium-macros 0.1.0", + "type-set", +] + [[package]] name = "trillium-logger" version = "0.4.5" @@ -5434,16 +5749,16 @@ checksum = "da5e9b6c08a27d991b4a9c73dd7276c6f181fd4dee7218723b0fbd7fca3a1659" dependencies = [ "colored 2.2.0", "log", - "size", + "size 0.4.1", "time", - "trillium", + "trillium 0.2.20", ] [[package]] name = "trillium-macros" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916054381183f0cfed7604bf7de2044a760624a50d26eef5492468fb73083bbb" +checksum = "916e37646d33632b88ca02d4b8c4e2e6376f2a89d9888de71b7d82c150ed1f6c" dependencies = [ "proc-macro2", "quote", @@ -5452,9 +5767,9 @@ dependencies = [ [[package]] name = "trillium-macros" -version = "0.0.6" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916e37646d33632b88ca02d4b8c4e2e6376f2a89d9888de71b7d82c150ed1f6c" +checksum = "3caa8c474e8cfacd96ca0692f57f932891543db2147beca4758a075a7d26a0b2" dependencies = [ "proc-macro2", "quote", @@ -5469,7 +5784,7 @@ checksum = "6a7aed20d63101d7dcd165fd047141423009a7f4ccfc75db5b875312d8127dbe" dependencies = [ "log", "routefinder", - "trillium", + "trillium 0.2.20", ] [[package]] @@ -5482,7 +5797,21 @@ dependencies = [ "log", "rustls-pemfile", "rustls-platform-verifier", - "trillium-server-common", + "trillium-server-common 0.5.2", + "webpki-roots 1.0.6", +] + +[[package]] +name = "trillium-rustls" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf428f82c0bcb0da509db3d4040d4ab921d3d2a6dd8796d128fb75639b00667" +dependencies = [ + "futures-rustls", + "log", + "rustls-pemfile", + "rustls-platform-verifier", + "trillium-server-common 0.7.2", "webpki-roots 1.0.6", ] @@ -5498,9 +5827,29 @@ dependencies = [ "futures-lite", "log", "pin-project-lite", - "rlimit", - "trillium", - "trillium-http", + "rlimit 0.10.1", + "trillium 0.2.20", + "trillium-http 0.3.17", + "url", +] + +[[package]] +name = "trillium-server-common" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd3dd35f2a09ec85c5367962bf37fe697ebebf03d8453adce89fbe759d47cc62" +dependencies = [ + "async-channel", + "async_cell", + "fieldwork", + "futures-lite", + "listenfd", + "log", + "pin-project-lite", + "rlimit 0.11.0", + "swansong", + "trillium 1.1.0", + "trillium-http 1.2.2", "url", ] @@ -5513,24 +5862,51 @@ dependencies = [ "async-channel", "async-dup", "cfg-if", - "dashmap", + "dashmap 5.5.3", "fastrand", "futures-lite", "once_cell", "portpicker", - "trillium", - "trillium-http", + "trillium 0.2.20", + "trillium-http 0.3.17", "trillium-macros 0.0.6", - "trillium-server-common", + "trillium-server-common 0.5.2", + "url", +] + +[[package]] +name = "trillium-testing" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d2b6a42052adfa2e5d55ad49dacd56b32ea9a175a7d632743d89bbb8105661" +dependencies = [ + "async-channel", + "async-dup", + "cfg-if", + "dashmap 6.2.1", + "env_logger", + "fastrand", + "fieldwork", + "futures-lite", + "log", + "once_cell", + "serde", + "sonic-rs", + "test-harness", + "trillium 1.1.0", + "trillium-client 0.8.4", + "trillium-http 1.2.2", + "trillium-macros 0.1.0", + "trillium-server-common 0.7.2", "trillium-tokio", "url", ] [[package]] name = "trillium-tokio" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "160f07d12cc798d7de6a65e2279bb445f0606ecc4a9c594315ffff556ab7968b" +checksum = "1b0d2e388eae1c568fb0ec5fe8d44253cbd338aa56139da9bb5663b22de01e2d" dependencies = [ "async-compat", "log", @@ -5538,10 +5914,10 @@ dependencies = [ "signal-hook-tokio", "tokio", "tokio-stream", - "trillium", - "trillium-http", - "trillium-macros 0.0.5", - "trillium-server-common", + "trillium 1.1.0", + "trillium-http 1.2.2", + "trillium-macros 0.1.0", + "trillium-server-common 0.7.2", ] [[package]] @@ -5550,6 +5926,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "type-set" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "845e18586b78ef401c37d9d2d2cca631c19816d5aa26af12647e828739bd6614" + [[package]] name = "typenum" version = "1.20.0" @@ -5875,7 +6257,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "redox_syscall", + "redox_syscall 0.4.1", "wasite", ] @@ -5987,15 +6369,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.61.2" diff --git a/client/Cargo.toml b/client/Cargo.toml index 11924041..4ea0424f 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -36,8 +36,8 @@ fastrand = "2.4.1" futures-lite = "2.6.1" test-support.workspace = true tokio = { version = "1", features = ["net"] } -trillium = "0.2.20" -trillium-http = "0.3.14" -trillium-testing = { version = "0.7.0", features = ["tokio"] } -trillium-tokio = "0.4.0" +trillium = "1.1.0" +trillium-http = "1.2.2" +trillium-testing = { version = "0.9.0", features = ["tokio"] } +trillium-tokio = "0.6.1" divviup-client = { path = ".", features = ["admin"] } diff --git a/test-support/Cargo.toml b/test-support/Cargo.toml index 30cdac5b..cfe73ab7 100644 --- a/test-support/Cargo.toml +++ b/test-support/Cargo.toml @@ -8,9 +8,9 @@ license.workspace = true [dependencies] fastrand = "2.4.1" time = "0.3.47" -trillium = "0.2.20" -trillium-macros = "0.0.6" -trillium-testing = { version = "0.7.0", features = ["tokio"] } +trillium = "1.1.0" +trillium-macros = "0.1.0" +trillium-testing = { version = "0.9.0", features = ["tokio"] } divviup-api = { workspace = true, features = ["test-header-injection"] } serde = "1.0.228" serde_json = "1.0.149" @@ -24,9 +24,9 @@ tracing-subscriber = { version = "0.3.23", features = [ "fmt", ] } trillium-client = { version = "0.6.2", features = ["json"] } -trillium-http = "0.3.14" -trillium-rustls = "0.9.0" -trillium-tokio = "0.4.0" +trillium-http = "1.2.2" +trillium-rustls = "0.11.1" +trillium-tokio = "0.6.1" reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] } tokio = { version = "1", features = ["net"] } url = "2.5.8"