From d865d39aec88c975de3c728f7d21a9a46995f88d Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Fri, 18 Oct 2024 18:16:04 +0800 Subject: [PATCH] update madsim to 0.2.31 --- Cargo.lock | 8 +++++--- Cargo.toml | 1 - src/object_store/Cargo.toml | 2 +- src/tests/simulation/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a106b29e50de..1a007b4fe121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7236,8 +7236,9 @@ dependencies = [ [[package]] name = "madsim" -version = "0.2.30" -source = "git+https://github.com/madsim-rs/madsim.git?rev=f0ffd24864245aea236833f1ff3638f75bd51700#f0ffd24864245aea236833f1ff3638f75bd51700" +version = "0.2.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c97f34bb19cf6a435a4da2187e90acc6bc59faa730e493b28b6d33e1bb9ccb" dependencies = [ "ahash 0.8.11", "async-channel 2.2.1", @@ -7285,7 +7286,8 @@ dependencies = [ [[package]] name = "madsim-macros" version = "0.2.12" -source = "git+https://github.com/madsim-rs/madsim.git?rev=f0ffd24864245aea236833f1ff3638f75bd51700#f0ffd24864245aea236833f1ff3638f75bd51700" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d248e97b1a48826a12c3828d921e8548e714394bf17274dd0a93910dc946e1" dependencies = [ "darling 0.14.4", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 78f02d46d60c..c51ee7fee738 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -354,7 +354,6 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = # If we can merge in: https://github.com/madsim-rs/sqlx/pull/2, # we can change it to patch madsim version instead. sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "ddf222f56cf99f865231a5383053645c6ea05ba3" } -madsim = { git = "https://github.com/madsim-rs/madsim.git", rev = "f0ffd24864245aea236833f1ff3638f75bd51700" } futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml index 912eb4073130..ccbdcdac45e6 100644 --- a/src/object_store/Cargo.toml +++ b/src/object_store/Cargo.toml @@ -30,7 +30,7 @@ hyper = { version = "0.14", features = ["tcp", "client"] } # hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] } hyper-tls = "0.5.0" itertools = { workspace = true } -madsim = "0.2.30" +madsim = "0.2.31" opendal = { workspace = true, features = [ "executors-tokio", "services-azblob", diff --git a/src/tests/simulation/Cargo.toml b/src/tests/simulation/Cargo.toml index 190a8396001b..f5b3fc6145e1 100644 --- a/src/tests/simulation/Cargo.toml +++ b/src/tests/simulation/Cargo.toml @@ -23,7 +23,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] } glob = "0.3" itertools = { workspace = true } lru = { workspace = true } -madsim = "0.2.30" +madsim = "0.2.31" maplit = "1" paste = "1" pin-project = "1.1"