diff --git a/Cargo.lock b/Cargo.lock index af48dbb71..89e1259db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,12 +202,15 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "1.4.3" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04" +checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" dependencies = [ + "async-channel", "async-executor", "async-io", + "async-mutex", + "blocking", "futures-lite", "num_cpus", "once_cell", @@ -233,9 +236,9 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bdc2bb91844456110d27da8f712f4cbc693f3538521a43cb79c6b2e6f717f3e" +checksum = "bbb2df4b37a99456360a9ab475b723e3a499d51e060ab1bdd8d7565d23dcb74b" dependencies = [ "async-native-tls", "async-std", @@ -273,6 +276,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "async-lock" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" +dependencies = [ + "event-listener", +] + [[package]] name = "async-mutex" version = "1.4.0" @@ -334,17 +346,16 @@ dependencies = [ [[package]] name = "async-std" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8" +checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" dependencies = [ "async-attributes", "async-channel", "async-global-executor", "async-io", - "async-mutex", + "async-lock", "async-process", - "blocking", "crossbeam-utils 0.8.3", "futures-channel", "futures-core", @@ -356,7 +367,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.6", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -1602,7 +1613,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.6", + "pin-project-lite", "waker-fn", ] @@ -1643,7 +1654,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1841,7 +1852,7 @@ dependencies = [ "cookie", "futures-lite", "infer", - "pin-project-lite 0.2.6", + "pin-project-lite", "rand 0.7.3", "serde", "serde_json", @@ -2613,12 +2624,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.6" @@ -3504,12 +3509,12 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "stop-token" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06855fb7c94d3be9b3a57c4d82dfc8a43bb658fbb3b1dda79de89e748d9eb9dd" +checksum = "2d5e0f9b25bdd9bf18e33d1f4dd0194c77034b66b4a4842b0bf7f5cf53ca733a" dependencies = [ "async-std", - "pin-project-lite 0.1.12", + "pin-project-lite", ] [[package]] @@ -3566,7 +3571,7 @@ dependencies = [ "http-types", "log", "mime_guess", - "pin-project-lite 0.2.6", + "pin-project-lite", "serde", "serde_json", ] @@ -3727,7 +3732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" dependencies = [ "autocfg 1.0.1", - "pin-project-lite 0.2.6", + "pin-project-lite", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 509524499..f2793d3fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,11 +16,11 @@ deltachat_derive = { path = "./deltachat_derive" } ansi_term = { version = "0.12.1", optional = true } anyhow = "1.0.40" -async-imap = "0.4.0" +async-imap = "0.5.0" async-native-tls = { version = "0.3.3" } async-smtp = { git = "https://github.com/async-email/async-smtp", rev="2275fd8d13e39b2c58d6605c786ff06ff9e05708" } async-std-resolver = "0.20.2" -async-std = { version = "~1.8.0", features = ["unstable"] } +async-std = { version = "~1.9.0", features = ["unstable"] } async-tar = "0.3.0" async-trait = "0.1.50" backtrace = "0.3.58" @@ -65,7 +65,7 @@ serde = { version = "1.0", features = ["derive"] } sha-1 = "0.9.3" sha2 = "0.9.0" smallvec = "1.0.0" -stop-token = { version = "0.1.1", features = ["unstable"] } +stop-token = "0.2.0" strum = "0.20.0" strum_macros = "0.20.1" surf = { version = "2.0.0-alpha.4", default-features = false, features = ["h1-client"] } @@ -76,7 +76,7 @@ uuid = { version = "0.8", features = ["serde", "v4"] } [dev-dependencies] ansi_term = "0.12.0" -async-std = { version = "1.6.4", features = ["unstable", "attributes"] } +async-std = { version = "1.9.0", features = ["unstable", "attributes"] } criterion = "0.3" futures-lite = "1.7.0" log = "0.4.11" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index f5cca8af0..f54a3cc00 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -20,7 +20,7 @@ libc = "0.2" human-panic = "1.0.1" num-traits = "0.2.6" serde_json = "1.0" -async-std = "1.6.0" +async-std = "1.9.0" anyhow = "1.0.40" thiserror = "1.0.14" rand = "0.7.3"