From 5484aad2817d68a94190edb46a25fa7995da79a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2026 20:21:22 +0000 Subject: [PATCH] Bump trillium-rustls from 0.9.0 to 0.11.3 Bumps [trillium-rustls](https://github.com/trillium-rs/trillium) from 0.9.0 to 0.11.3. - [Release notes](https://github.com/trillium-rs/trillium/releases) - [Commits](https://github.com/trillium-rs/trillium/compare/trillium-rustls-v0.9.0...trillium-rustls-v0.11.3) --- updated-dependencies: - dependency-name: trillium-rustls dependency-version: 0.11.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 302 ++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 2 +- 2 files changed, 198 insertions(+), 106 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ae921bc4..8ac32dc94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -795,18 +795,18 @@ dependencies = [ "shlex 2.0.1", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" 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 +1415,7 @@ dependencies = [ "thiserror 2.0.18", "time", "trillium-client", - "trillium-http", + "trillium-http 0.3.17", "url", "uuid", ] @@ -1639,6 +1639,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 +2072,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" @@ -3016,27 +3041,32 @@ dependencies = [ [[package]] name = "jni" -version = "0.21.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" dependencies = [ - "cesu8", "cfg-if", "combine", - "jni-sys 0.3.1", + "jni-macros", + "jni-sys", "log", - "thiserror 1.0.69", + "simd_cesu8", + "thiserror 2.0.18", "walkdir", - "windows-sys 0.45.0", + "windows-link", ] [[package]] -name = "jni-sys" -version = "0.3.1" +name = "jni-macros" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" dependencies = [ - "jni-sys 0.4.1", + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn", ] [[package]] @@ -3235,6 +3265,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 +4542,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" @@ -4616,9 +4666,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" dependencies = [ "core-foundation", "core-foundation-sys", @@ -5073,6 +5123,22 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "similar" version = "2.7.0" @@ -5442,6 +5508,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 +6197,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.3.10", + "trillium-macros 0.1.0", ] [[package]] @@ -6140,8 +6230,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,6 +6256,34 @@ dependencies = [ "trillium-macros 0.0.6", ] +[[package]] +name = "trillium-http" +version = "1.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c6de92944bcc6f4c19ffa329d9f20ad81bc2f93a2008871e1facd3219ae78a" +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" @@ -6188,17 +6306,28 @@ dependencies = [ "syn", ] +[[package]] +name = "trillium-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa8c474e8cfacd96ca0692f57f932891543db2147beca4758a075a7d26a0b2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "trillium-rustls" -version = "0.9.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0501210eedcb4eae5d4a48c7855632f4be7fac5f57c7c772f5b1e598d6db53ff" +checksum = "f8c7da9a57686f04771d29d25d3b2c11d5180063d3fb12fb2cf89d1e8516c81f" dependencies = [ "futures-rustls", "log", "rustls-pemfile", "rustls-platform-verifier", - "trillium-server-common", + "trillium-server-common 0.7.7", "webpki-roots", ] @@ -6214,9 +6343,32 @@ 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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6981ace34aa3164b8a25f8083fbd66e077bbf6f5015b07ad7832335d66107bcf" +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.3.10", "url", ] @@ -6232,10 +6384,10 @@ dependencies = [ "signal-hook-tokio 0.3.1", "tokio", "tokio-stream", - "trillium", - "trillium-http", + "trillium 0.2.20", + "trillium-http 0.3.17", "trillium-macros 0.0.5", - "trillium-server-common", + "trillium-server-common 0.5.2", ] [[package]] @@ -6278,6 +6430,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" @@ -6697,22 +6855,13 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -6724,67 +6873,34 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6797,48 +6913,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" diff --git a/Cargo.toml b/Cargo.toml index e23fca2d5..bfe04885e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,7 +120,7 @@ tracing-opentelemetry = "0.28" tracing-stackdriver = "0.10.0" tracing-subscriber = "0.3" # TODO: Remove once divviup-client is migrated off Trillium. -trillium-rustls = "0.9" +trillium-rustls = "0.11" trillium-tokio = "0.6.3" trycmd = "1.2.0" url = { version = "2.5.8", features = ["serde"] }