diff --git a/Cargo.lock b/Cargo.lock index 23ae8daf7..ccf494f79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,16 +46,16 @@ dependencies = [ name = "actix-files" version = "0.6.6" dependencies = [ - "actix-http", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-server", "actix-service", - "actix-test", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils", - "actix-web", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 2.9.1", "bytes", - "derive_more", + "derive_more 2.0.1", "env_logger", "futures-core", "http-range", @@ -69,18 +69,41 @@ dependencies = [ "v_htmlescape", ] +[[package]] +name = "actix-files" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +dependencies = [ + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service", + "actix-utils", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 2.9.1", + "bytes", + "derive_more 0.99.20", + "futures-core", + "http-range", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "v_htmlescape", +] + [[package]] name = "actix-http" version = "3.11.0" dependencies = [ "actix-codec", - "actix-http-test", + "actix-http-test 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-server", "actix-service", "actix-tls", "actix-utils", - "actix-web", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "async-stream", "base64 0.22.1", "bitflags 2.9.1", @@ -88,7 +111,7 @@ dependencies = [ "bytes", "bytestring", "criterion", - "derive_more", + "derive_more 2.0.1", "divan", "encoding_rs", "env_logger", @@ -126,18 +149,84 @@ dependencies = [ "zstd", ] +[[package]] +name = "actix-http" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-tls", + "actix-utils", + "base64 0.22.1", + "bitflags 2.9.1", + "brotli", + "bytes", + "bytestring", + "derive_more 2.0.1", + "encoding_rs", + "flate2", + "foldhash", + "futures-core", + "h2", + "http 0.2.12", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand 0.9.1", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd", +] + [[package]] name = "actix-http-test" version = "3.2.0" dependencies = [ "actix-codec", - "actix-http", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-server", "actix-service", "actix-tls", "actix-utils", - "awc", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures-core", + "http 0.2.12", + "log", + "openssl", + "serde", + "serde_json", + "serde_urlencoded", + "slab", + "socket2 0.5.9", + "tokio", +] + +[[package]] +name = "actix-http-test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061d27c2a6fea968fdaca0961ff429d23a4ec878c4f68f5d08626663ade69c80" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-server", + "actix-service", + "actix-tls", + "actix-utils", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", "futures-core", "http 0.2.12", @@ -165,16 +254,16 @@ dependencies = [ name = "actix-multipart" version = "0.7.2" dependencies = [ - "actix-http", - "actix-multipart-derive", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-multipart-derive 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-multipart-rfc7578", "actix-rt", - "actix-test", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils", - "actix-web", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "assert_matches", - "awc", - "derive_more", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 2.0.1", "env_logger", "futures-core", "futures-test", @@ -194,12 +283,37 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "actix-multipart" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5118a26dee7e34e894f7e85aa0ee5080ae4c18bf03c0e30d49a80e418f00a53" +dependencies = [ + "actix-multipart-derive 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.99.20", + "futures-core", + "futures-util", + "httparse", + "local-waker", + "log", + "memchr", + "mime", + "rand 0.8.5", + "serde", + "serde_json", + "serde_plain", + "tempfile", + "tokio", +] + [[package]] name = "actix-multipart-derive" version = "0.7.0" dependencies = [ - "actix-multipart", - "actix-web", + "actix-multipart 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytesize", "darling", "proc-macro2", @@ -209,13 +323,26 @@ dependencies = [ "trybuild", ] +[[package]] +name = "actix-multipart-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11eb847f49a700678ea2fa73daeb3208061afa2b9d1a8527c03390f4c4a1c6b" +dependencies = [ + "darling", + "parse-size", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "actix-multipart-rfc7578" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af5e8f1e4c6baf42b8b78f3b2a85df02b54f10f5fdf54bf1f9b40211c130e427" dependencies = [ - "actix-http", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", "common-multipart-rfc7578", "futures-core", @@ -237,6 +364,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "actix-router" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" +dependencies = [ + "bytestring", + "cfg-if", + "http 0.2.12", + "regex", + "regex-lite", + "serde", + "tracing", +] + [[package]] name = "actix-rt" version = "2.10.0" @@ -282,13 +424,13 @@ name = "actix-test" version = "0.1.5" dependencies = [ "actix-codec", - "actix-http", - "actix-http-test", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http-test 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-service", "actix-utils", - "actix-web", - "awc", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core", "futures-util", "log", @@ -303,6 +445,31 @@ dependencies = [ "tokio", ] +[[package]] +name = "actix-test" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439022b5a7b5dac10798465029a9566e8e0cca7a6014541ed277b695691fac5f" +dependencies = [ + "actix-codec", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http-test 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt", + "actix-service", + "actix-utils", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core", + "futures-util", + "log", + "openssl", + "rustls 0.23.27", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", +] + [[package]] name = "actix-tls" version = "3.4.0" @@ -348,18 +515,18 @@ name = "actix-web" version = "4.11.0" dependencies = [ "actix-codec", - "actix-files", - "actix-http", + "actix-files 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-macros", - "actix-router", + "actix-router 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-server", "actix-service", - "actix-test", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-tls", "actix-utils", - "actix-web-codegen", - "awc", + "actix-web-codegen 4.3.0", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli", "bytes", "bytestring", @@ -368,7 +535,7 @@ dependencies = [ "cookie", "core_affinity", "criterion", - "derive_more", + "derive_more 2.0.1", "encoding_rs", "env_logger", "flate2", @@ -403,17 +570,61 @@ dependencies = [ "zstd", ] +[[package]] +name = "actix-web" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea" +dependencies = [ + "actix-codec", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-macros", + "actix-router 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt", + "actix-server", + "actix-service", + "actix-tls", + "actix-utils", + "actix-web-codegen 4.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "bytestring", + "cfg-if", + "cookie", + "derive_more 2.0.1", + "encoding_rs", + "foldhash", + "futures-core", + "futures-util", + "impl-more", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2 0.5.9", + "time", + "tracing", + "url", +] + [[package]] name = "actix-web-actors" version = "4.3.1+deprecated" dependencies = [ "actix", "actix-codec", - "actix-http", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", - "actix-test", - "actix-web", - "awc", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "awc 3.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", "bytestring", "env_logger", @@ -430,11 +641,11 @@ name = "actix-web-codegen" version = "4.3.0" dependencies = [ "actix-macros", - "actix-router", + "actix-router 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", - "actix-test", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils", - "actix-web", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core", "proc-macro2", "quote", @@ -443,6 +654,18 @@ dependencies = [ "trybuild", ] +[[package]] +name = "actix-web-codegen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" +dependencies = [ + "actix-router 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "addr2line" version = "0.24.2" @@ -623,22 +846,22 @@ name = "awc" version = "3.7.0" dependencies = [ "actix-codec", - "actix-http", - "actix-http-test", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http-test 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt", "actix-server", "actix-service", - "actix-test", + "actix-test 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-tls", "actix-utils", - "actix-web", + "actix-web 4.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.22.1", "brotli", "bytes", "cfg-if", "const-str", "cookie", - "derive_more", + "derive_more 2.0.1", "env_logger", "flate2", "futures-core", @@ -667,6 +890,44 @@ dependencies = [ "zstd", ] +[[package]] +name = "awc" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e76d68b4f02400c2f9110437f254873e8f265b35ea87352f142bc7c8e878115a" +dependencies = [ + "actix-codec", + "actix-http 3.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt", + "actix-service", + "actix-tls", + "actix-utils", + "base64 0.22.1", + "bytes", + "cfg-if", + "cookie", + "derive_more 2.0.1", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "itoa", + "log", + "mime", + "openssl", + "percent-encoding", + "pin-project-lite", + "rand 0.9.1", + "rustls 0.20.9", + "rustls 0.21.12", + "rustls 0.22.4", + "rustls 0.23.27", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", +] + [[package]] name = "aws-lc-rs" version = "1.13.1" @@ -817,9 +1078,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.22" +version = "1.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1" +checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" dependencies = [ "jobserver", "libc", @@ -891,18 +1152,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstyle", "clap_lex", @@ -958,6 +1219,12 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cookie" version = "0.16.2" @@ -1167,6 +1434,19 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + [[package]] name = "derive_more" version = "2.0.1" @@ -1299,9 +1579,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys 0.59.0", @@ -1676,9 +1956,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", @@ -1692,9 +1972,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" @@ -1914,12 +2194,12 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] @@ -2183,6 +2463,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "parse-size" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f2ccd1e17ce8c1bfab3a65c89525af41cfad4c8659021a1e9a2aacd73b89b" + [[package]] name = "pem" version = "3.0.5" @@ -2488,9 +2774,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "resolv-conf" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c8f7f733062b66dc1c63f9db168ac0b97a9210e247fa90fdc9ad08f51b302" +checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" [[package]] name = "ring" @@ -2533,6 +2819,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.44" @@ -2751,6 +3046,12 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + [[package]] name = "serde" version = "1.0.219" @@ -3660,13 +3961,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "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", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -3679,6 +3996,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3691,6 +4014,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3703,12 +4032,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3721,6 +4062,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3733,6 +4080,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3745,6 +4098,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3757,6 +4116,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.7.10" diff --git a/Cargo.toml b/Cargo.toml index 88a08f8cf..dea29aa2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ lto = true opt-level = 3 codegen-units = 1 -[patch.crates-io] +[workspace.dependencies] actix-files = { path = "actix-files" } actix-http = { path = "actix-http" } actix-http-test = { path = "actix-http-test" } diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml index 39ffe3341..6c6e1e9ae 100644 --- a/actix-web/Cargo.toml +++ b/actix-web/Cargo.toml @@ -134,7 +134,7 @@ actix-utils = "3" actix-http = { version = "3.11", features = ["ws"] } actix-router = { version = "0.5.3", default-features = false, features = ["http"] } -actix-web-codegen = { version = "4.3", optional = true, default-features = false } +actix-web-codegen = { workspace = true, optional = true, default-features = false } bytes = "1" bytestring = "1"