From 821aba574409d44f79945a63d681d44c34ecf5f5 Mon Sep 17 00:00:00 2001 From: asonix Date: Sat, 26 Nov 2022 11:34:31 -0600 Subject: [PATCH] Update tokio-uring to 0.4 --- Cargo.toml | 3 +++ actix-files/CHANGES.md | 2 ++ actix-files/Cargo.toml | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 26b5b91b2..ce02f9536 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,3 +42,6 @@ awc = { path = "awc" } # actix-utils = { path = "../actix-net/actix-utils" } # actix-tls = { path = "../actix-net/actix-tls" } # actix-server = { path = "../actix-net/actix-server" } + +actix-server = { git = "https://github.com/actix/actix-net" } +actix-rt = { git = "https://github.com/actix/actix-net" } diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md index 6e57bf7a7..99067fe18 100644 --- a/actix-files/CHANGES.md +++ b/actix-files/CHANGES.md @@ -3,8 +3,10 @@ ## Unreleased - 2022-xx-xx - XHTML files now use `Content-Disposition: inline` instead of `attachment`. [#2903] - Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency. +- Update tokio-uring to 0.4 [#2903]: https://github.com/actix/actix-web/pull/2903 +[#????]: pending ## 0.6.2 - 2022-07-23 - Allow partial range responses for video content to start streaming sooner. [#2817] diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index 018acdfb1..2092ab17a 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -40,8 +40,8 @@ v_htmlescape= "0.15" # experimental-io-uring [target.'cfg(target_os = "linux")'.dependencies] -tokio-uring = { version = "0.3", optional = true, features = ["bytes"] } -actix-server = { version = "2.1", optional = true } # ensure matching tokio-uring versions +tokio-uring = { version = "0.4", optional = true, features = ["bytes"] } +actix-server = { version = "2.1", optional = true, features = ["io-uring"] } # ensure matching tokio-uring versions [dev-dependencies] actix-rt = "2.7"