diff --git a/Cargo.lock b/Cargo.lock index a8e138180c..b978e33aff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1985,6 +1985,15 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "memmap2" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.5.4" @@ -4387,7 +4396,7 @@ dependencies = [ "libc", "libloading 0.6.2", "log 0.4.8", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "num_cpus", @@ -4481,7 +4490,7 @@ dependencies = [ "itertools 0.9.0", "libsecp256k1", "log 0.4.8", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "pbkdf2", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index cf01afc960..2608d02894 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1039,13 +1039,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] -name = "memmap" -version = "0.7.0" +name = "memmap2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" dependencies = [ "libc", - "winapi 0.3.8", ] [[package]] @@ -2060,7 +2059,7 @@ dependencies = [ "libc", "libloading", "log", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "num_cpus", @@ -2106,7 +2105,7 @@ dependencies = [ "itertools", "libsecp256k1", "log", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "pbkdf2", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 801733b0af..04da8778c6 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -24,7 +24,7 @@ lazy_static = "1.4.0" libc = "0.2.72" libloading = "0.6.2" log = "0.4.8" -memmap = "0.7.0" +memmap2 = "0.1.0" num-derive = { version = "0.3" } num-traits = { version = "0.2" } num_cpus = "1.13.0" diff --git a/runtime/src/append_vec.rs b/runtime/src/append_vec.rs index 2a21023cbc..d6cb97e11a 100644 --- a/runtime/src/append_vec.rs +++ b/runtime/src/append_vec.rs @@ -1,5 +1,5 @@ use log::*; -use memmap::MmapMut; +use memmap2::MmapMut; use serde::{Deserialize, Serialize}; use solana_sdk::{ account::Account, diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 3b061e5814..a0c8ed5ac9 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -20,7 +20,7 @@ default = [ "chrono", "curve25519-dalek", "generic-array", - "memmap", + "memmap2", "rand", "rand_chacha", "serde_json", @@ -45,7 +45,7 @@ hex = "0.4.2" hmac = "0.7.0" itertools = { version = "0.9.0" } log = { version = "0.4.8" } -memmap = { version = "0.7.0", optional = true } +memmap2 = { version = "0.1.0", optional = true } num-derive = { version = "0.3" } num-traits = { version = "0.2" } pbkdf2 = { version = "0.3.0", default-features = false } diff --git a/sdk/src/abi_example.rs b/sdk/src/abi_example.rs index 81692d2388..aeebd29d58 100644 --- a/sdk/src/abi_example.rs +++ b/sdk/src/abi_example.rs @@ -414,9 +414,9 @@ impl AbiExample for BTreeSet { } #[cfg(not(feature = "program"))] -impl AbiExample for memmap::MmapMut { +impl AbiExample for memmap2::MmapMut { fn example() -> Self { - memmap::MmapMut::map_anon(1).expect("failed to map the data file") + memmap2::MmapMut::map_anon(1).expect("failed to map the data file") } } diff --git a/sdk/src/genesis_config.rs b/sdk/src/genesis_config.rs index 58631b408f..47ba24f087 100644 --- a/sdk/src/genesis_config.rs +++ b/sdk/src/genesis_config.rs @@ -18,7 +18,7 @@ use crate::{ }; use bincode::{deserialize, serialize}; use chrono::{TimeZone, Utc}; -use memmap::Mmap; +use memmap2::Mmap; use std::{ collections::BTreeMap, fmt,