From 156a9d1b844986798b38ef801613dcf233a53f1f Mon Sep 17 00:00:00 2001 From: John Nunley Date: Wed, 1 Nov 2023 20:19:00 -0700 Subject: [PATCH 1/2] Bump various dependencies - async-lock - futures-lite - async-channel - async-net Signed-off-by: John Nunley --- Cargo.toml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3d61b3b..2f685fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,11 +23,11 @@ name = "timer" harness = false [dependencies] -async-lock = "3.0" +async-lock = "3.0.0" cfg-if = "1" concurrent-queue = "2.2.0" futures-io = { version = "0.3.28", default-features = false, features = ["std"] } -futures-lite = { version = "1.11.0", default-features = false } +futures-lite = { version = "2.0.0", default-features = false } parking = "2.0.0" polling = "3.0.0" rustix = { version = "0.38.2", default-features = false, features = ["fs", "net", "std"] } @@ -39,8 +39,13 @@ waker-fn = "1.1.0" windows-sys = { version = "0.48.0", features = ["Win32_Foundation"] } [dev-dependencies] +<<<<<<< HEAD async-channel = "2" async-net = "1" +======= +async-channel = "2.0.0" +async-net = "2.0.0" +>>>>>>> faa5742 (Bump various dependencies) blocking = "1" criterion = { version = "0.4", default-features = false, features = ["cargo_bench_support"] } getrandom = "0.2.7" From 686f50f1f8f860572cb2ab8fa227328dc39fd662 Mon Sep 17 00:00:00 2001 From: John Nunley Date: Thu, 2 Nov 2023 19:36:04 -0700 Subject: [PATCH 2/2] notgull pushed a merge conflict, is he stupid? Signed-off-by: John Nunley --- Cargo.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2f685fa..29d679f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,13 +39,8 @@ waker-fn = "1.1.0" windows-sys = { version = "0.48.0", features = ["Win32_Foundation"] } [dev-dependencies] -<<<<<<< HEAD -async-channel = "2" -async-net = "1" -======= async-channel = "2.0.0" async-net = "2.0.0" ->>>>>>> faa5742 (Bump various dependencies) blocking = "1" criterion = { version = "0.4", default-features = false, features = ["cargo_bench_support"] } getrandom = "0.2.7"