diff --git a/Cargo.lock b/Cargo.lock index 0d676fa88a..7032de0cf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2100,6 +2100,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" @@ -4136,7 +4145,7 @@ dependencies = [ "bv", "generic-array 0.14.3", "log 0.4.8", - "memmap", + "memmap2", "rustc_version", "serde", "serde_derive", @@ -4690,7 +4699,7 @@ dependencies = [ "libc", "libloading 0.6.2", "log 0.4.8", - "memmap", + "memmap2", "num-derive", "num-traits", "num_cpus", @@ -4748,7 +4757,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log 0.4.8", - "memmap", + "memmap2", "num-derive", "num-traits", "pbkdf2", diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml index c74cd97271..be581c1a35 100644 --- a/frozen-abi/Cargo.toml +++ b/frozen-abi/Cargo.toml @@ -21,7 +21,7 @@ thiserror = "1.0" [target.'cfg(not(target_arch = "bpf"))'.dependencies] solana-logger = { path = "../logger", version = "1.4.16" } generic-array = { version = "0.14.3", default-features = false, features = ["serde", "more_lengths"]} -memmap = "0.7.0" +memmap2 = "0.1.0" [build-dependencies] rustc_version = "0.2" diff --git a/frozen-abi/src/abi_example.rs b/frozen-abi/src/abi_example.rs index 2d24d05f23..fdb858aa5c 100644 --- a/frozen-abi/src/abi_example.rs +++ b/frozen-abi/src/abi_example.rs @@ -415,9 +415,9 @@ impl AbiExample for BTreeSet { } #[cfg(not(target_arch = "bpf"))] -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/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 982eefff57..f95a30339c 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1086,13 +1086,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]] @@ -2130,7 +2129,7 @@ dependencies = [ "bv", "generic-array 0.14.3", "log", - "memmap", + "memmap2", "rustc_version", "serde", "serde_derive", @@ -2239,7 +2238,7 @@ dependencies = [ "libc", "libloading", "log", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "num_cpus", @@ -2287,7 +2286,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "memmap", + "memmap2", "num-derive 0.3.0", "num-traits", "pbkdf2", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 7f59ab3f5a..47b565f55c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -25,7 +25,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 ef258a34b4..2a022168c1 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -22,7 +22,7 @@ full = [ "byteorder", "chrono", "generic-array", - "memmap", + "memmap2", "rand", "rand_chacha", "serde_json", @@ -48,7 +48,7 @@ hmac = "0.7.0" itertools = "0.9.0" lazy_static = "1.4.0" log = "0.4.8" -memmap = { version = "0.7.0", optional = true } +memmap2 = { version = "0.1.0", optional = true } num-derive = "0.3" num-traits = "0.2" pbkdf2 = { version = "0.3.0", default-features = false } diff --git a/sdk/src/genesis_config.rs b/sdk/src/genesis_config.rs index 17dbb66829..078d302113 100644 --- a/sdk/src/genesis_config.rs +++ b/sdk/src/genesis_config.rs @@ -20,7 +20,7 @@ use crate::{ }; use bincode::{deserialize, serialize}; use chrono::{TimeZone, Utc}; -use memmap::Mmap; +use memmap2::Mmap; use std::{ collections::BTreeMap, fmt,