diff --git a/Cargo.lock b/Cargo.lock index 01f73bb4..f878b590 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2515,7 +2515,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.11", + "parking_lot_core", ] [[package]] @@ -6993,14 +6993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", - "parking_lot_core 0.9.11", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -dependencies = [ - "parking_lot_core 0.9.11", + "parking_lot_core", ] [[package]] @@ -11835,7 +11828,7 @@ dependencies = [ "cfg_aliases 0.2.1", "libc", "parking_lot 0.12.4", - "parking_lot_core 0.9.11", + "parking_lot_core", "static_init_macro", "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 052343cc..067e9d06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,6 @@ resolver = "2" members = [ # Version patches - "patches/parking_lot_core", "patches/parking_lot", "patches/zstd", "patches/rocksdb", @@ -204,7 +203,6 @@ modular-frost = { path = "crypto/frost" } # https://github.com/rust-lang-nursery/lazy-static.rs/issues/201 lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" } -parking_lot_core = { path = "patches/parking_lot_core" } parking_lot = { path = "patches/parking_lot" } # wasmtime pulls in an old version for this zstd = { path = "patches/zstd" } diff --git a/patches/parking_lot_core/Cargo.toml b/patches/parking_lot_core/Cargo.toml deleted file mode 100644 index cafd432b..00000000 --- a/patches/parking_lot_core/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "parking_lot_core" -version = "0.8.6" -description = "parking_lot_core which patches to the latest update" -license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/patches/parking_lot_core" -authors = ["Luke Parker "] -keywords = [] -edition = "2021" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dependencies] -parking_lot_core = "0.9" diff --git a/patches/parking_lot_core/src/lib.rs b/patches/parking_lot_core/src/lib.rs deleted file mode 100644 index bfecbfd8..00000000 --- a/patches/parking_lot_core/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub use parking_lot_core::*;