diff --git a/Cargo.lock b/Cargo.lock index 998178c08..f92cdc4c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -807,6 +807,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.9.1" @@ -1415,7 +1421,7 @@ dependencies = [ "thiserror 2.0.18", "time", "trillium-client", - "trillium-http", + "trillium-http 0.3.17", "url", "uuid", ] @@ -1639,6 +1645,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", +] + [[package]] name = "filetime" version = "0.2.29" @@ -2052,6 +2078,11 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" @@ -2634,8 +2665,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "signal-hook 0.4.4", - "signal-hook-tokio 0.4.0", + "signal-hook", + "signal-hook-tokio", "tempfile", "testcontainers", "thiserror 2.0.18", @@ -3235,6 +3266,17 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +[[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.8.2" @@ -4501,6 +4543,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 = "rstest" version = "0.26.1" @@ -5013,16 +5064,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook" version = "0.4.4" @@ -5043,18 +5084,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook 0.3.18", - "tokio", -] - [[package]] name = "signal-hook-tokio" version = "0.4.0" @@ -5063,7 +5092,7 @@ checksum = "e513e435a8898a0002270f29d0a708b7879708fb5c4d00e46983ca2d2d378cf0" dependencies = [ "futures-core", "libc", - "signal-hook 0.4.4", + "signal-hook", "tokio", ] @@ -5442,6 +5471,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 = "2.0.118" @@ -6119,7 +6160,19 @@ checksum = "b84b5b14b3b2dda42a660fd7476a00f25c7565c4f1dc63b4322a7855a1c5384f" dependencies = [ "async-trait", "log", - "trillium-http", + "trillium-http 0.3.17", +] + +[[package]] +name = "trillium" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616f6b4783efa17cd96b35ce691de520aefe69c2ef0af3f422e92eb25dc39392" +dependencies = [ + "futures-lite", + "log", + "trillium-http 1.4.2", + "trillium-macros 0.1.0", ] [[package]] @@ -6140,8 +6193,8 @@ dependencies = [ "serde_json", "size", "thiserror 1.0.69", - "trillium-http", - "trillium-server-common", + "trillium-http 0.3.17", + "trillium-server-common 0.5.2", ] [[package]] @@ -6166,11 +6219,39 @@ dependencies = [ "trillium-macros 0.0.6", ] +[[package]] +name = "trillium-http" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2a75892ba169be7ca3a1746fa0354eb00145494257e00d033e30ef60ddb6d1" +dependencies = [ + "atomic-waker", + "encoding_rs", + "event-listener 5.4.1", + "fastrand", + "fieldwork", + "futures-lite", + "hashbrown 0.17.1", + "httpdate", + "log", + "memchr", + "mime", + "pin-project-lite", + "smallvec", + "smartcow", + "smartstring", + "swansong", + "sync_wrapper", + "thiserror 2.0.18", + "trillium-macros 0.1.0", + "type-set", +] + [[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", @@ -6179,9 +6260,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", @@ -6198,7 +6279,7 @@ dependencies = [ "log", "rustls-pemfile", "rustls-platform-verifier", - "trillium-server-common", + "trillium-server-common 0.5.2", "webpki-roots", ] @@ -6214,28 +6295,51 @@ dependencies = [ "futures-lite", "log", "pin-project-lite", - "rlimit", - "trillium", - "trillium-http", + "rlimit 0.10.2", + "trillium 0.2.20", + "trillium-http 0.3.17", + "url", +] + +[[package]] +name = "trillium-server-common" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf9670b5b6bf18a8411c78201879b5628ac7e3d148854f63e0640f7cd15ac820" +dependencies = [ + "async-channel 2.5.0", + "async_cell", + "atomic-waker", + "cfg_aliases", + "fieldwork", + "futures-lite", + "listenfd", + "log", + "pin-project-lite", + "rlimit 0.11.0", + "smallvec", + "swansong", + "trillium 1.3.0", + "trillium-http 1.4.2", "url", ] [[package]] name = "trillium-tokio" -version = "0.4.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "160f07d12cc798d7de6a65e2279bb445f0606ecc4a9c594315ffff556ab7968b" +checksum = "25e3b81554f70e425cc23030c8cd5c851a213d883cb30ebbf81eb2e9b24be1ad" dependencies = [ "async-compat", "log", - "signal-hook 0.3.18", - "signal-hook-tokio 0.3.1", + "signal-hook", + "signal-hook-tokio", "tokio", "tokio-stream", - "trillium", - "trillium-http", - "trillium-macros 0.0.5", - "trillium-server-common", + "trillium 1.3.0", + "trillium-http 1.4.2", + "trillium-macros 0.1.0", + "trillium-server-common 0.7.8", ] [[package]] @@ -6278,6 +6382,12 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "type-set" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6d0bbc2be93a6be556bf72da67cab01b87e650f9dbd8a095e8b1a3d4712dfb" + [[package]] name = "typenum" version = "1.20.1" diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index b92d528a6..15a55326a 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -60,4 +60,4 @@ tracing.workspace = true # TODO(divviup/divviup-api#...): Remove once divviup-client is migrated off Trillium. trillium-rustls.workspace = true # trillium-tokio must remain at 0.4.x to match divviup-client's trillium-server-common 0.5.x stack. -trillium-tokio = "0.4" +trillium-tokio = "0.6"