From a524f15e34140fc40761a4d6d17af4cb76aa37b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:51:27 +0100
Subject: [PATCH] build(deps): update tokio-uring requirement from 0.4 to 0.5
 (#568)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>
---
 .github/workflows/ci.yml | 4 +---
 actix-rt/Cargo.toml      | 2 +-
 actix-rt/tests/tests.rs  | 2 +-
 actix-server/Cargo.toml  | 2 +-
 justfile                 | 9 +++++++++
 5 files changed, 13 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 actix-server/Cargo.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7d47f7cc9..664d5e9ef0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   read_msrv:
     name: Read MSRV
-    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
 
   build_and_test:
     needs:
@@ -109,8 +109,6 @@ jobs:
       - name: tests
         run: just test
 
-      # TODO: re-instate some io-uring tests for PRs
-
       - name: CI cache clean
         run: cargo-ci-cache-clean
 
diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml
index f39936064d..0b59279c25 100644
--- a/actix-rt/Cargo.toml
+++ b/actix-rt/Cargo.toml
@@ -33,7 +33,7 @@ tokio = { version = "1.23.1", features = ["rt", "net", "parking_lot", "signal",
 
 # runtime for `io-uring` feature
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.4", optional = true }
+tokio-uring = { version = "0.5", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.23.1", features = ["full"] }
diff --git a/actix-rt/tests/tests.rs b/actix-rt/tests/tests.rs
index be7c3248c4..330e27ff94 100644
--- a/actix-rt/tests/tests.rs
+++ b/actix-rt/tests/tests.rs
@@ -358,7 +358,7 @@ fn tokio_uring_arbiter() {
                 let f = tokio_uring::fs::File::create("test.txt").await.unwrap();
                 let buf = b"Hello World!";
 
-                let (res, _) = f.write_at(&buf[..], 0).await;
+                let (res, _) = f.write_all_at(&buf[..], 0).await;
                 assert!(res.is_ok());
 
                 f.sync_all().await.unwrap();
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
old mode 100755
new mode 100644
index 118b86b039..f37cca97d5
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -38,7 +38,7 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # runtime for `io-uring` feature
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.4", optional = true }
+tokio-uring = { version = "0.5", optional = true }
 
 [dev-dependencies]
 actix-codec = "0.5"
diff --git a/justfile b/justfile
index eb046683e3..ae80165b70 100644
--- a/justfile
+++ b/justfile
@@ -28,11 +28,20 @@ all_crate_features := if os() == "linux" {
 }
 
 # Test workspace code.
+[macos, windows]
 test toolchain="":
     cargo {{ toolchain }} test --lib --tests --package=actix-macros
     cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
     cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ all_crate_features }}
 
+# Test workspace code.
+[linux]
+test toolchain="":
+    cargo {{ toolchain }} test --lib --tests --package=actix-macros
+    cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
+    cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ non_linux_all_features_list }}
+    cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ all_crate_features }}
+
 # Test workspace using MSRV.
 test-msrv: downgrade-for-msrv (test msrv_rustup)