actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-23 20:51:06 +01:00
Code Issues Releases Wiki Activity

build(deps): update tokio-uring requirement from 0.4 to 0.5 (#568)

Browse Source 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>
This commit is contained in:
dependabot[bot] 2024-06-07 18:51:27 +01:00 committed by GitHub
parent 451a44c2e0
commit a524f15e34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -15,7 +15,7 @@ concurrency:
jobs: jobs:
read_msrv: read_msrv:
name: 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: build_and_test:
needs: needs:
@ -109,8 +109,6 @@ jobs:
- name: tests - name: tests
run: just test run: just test
# TODO: re-instate some io-uring tests for PRs
- name: CI cache clean - name: CI cache clean
run: cargo-ci-cache-clean run: cargo-ci-cache-clean

2
actix-rt/Cargo.toml
View File

@ -33,7 +33,7 @@ tokio = { version = "1.23.1", features = ["rt", "net", "parking_lot", "signal",
# runtime for `io-uring` feature # runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
tokio-uring = { version = "0.4", optional = true } tokio-uring = { version = "0.5", optional = true }
[dev-dependencies] [dev-dependencies]
tokio = { version = "1.23.1", features = ["full"] } tokio = { version = "1.23.1", features = ["full"] }

2
actix-rt/tests/tests.rs
View File

@ -358,7 +358,7 @@ fn tokio_uring_arbiter() {
let f = tokio_uring::fs::File::create("test.txt").await.unwrap(); let f = tokio_uring::fs::File::create("test.txt").await.unwrap();
let buf = b"Hello World!"; 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()); assert!(res.is_ok());
f.sync_all().await.unwrap(); f.sync_all().await.unwrap();

2
actix-server/Cargo.toml Executable file → Normal file
View File

@ -38,7 +38,7 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }
# runtime for `io-uring` feature # runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
tokio-uring = { version = "0.4", optional = true } tokio-uring = { version = "0.5", optional = true }
[dev-dependencies] [dev-dependencies]
actix-codec = "0.5" actix-codec = "0.5"

9
justfile
View File

@ -28,11 +28,20 @@ all_crate_features := if os() == "linux" {
} }
# Test workspace code. # Test workspace code.
[macos, windows]
test toolchain="": test toolchain="":
cargo {{ toolchain }} test --lib --tests --package=actix-macros 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 --no-default-features
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ all_crate_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 workspace using MSRV.
test-msrv: downgrade-for-msrv (test msrv_rustup) test-msrv: downgrade-for-msrv (test msrv_rustup)