From b396f6dc6faddeca916bd3bfedf7e96fec4eed79 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Tue, 16 Feb 2021 11:55:27 -0800
Subject: [PATCH] Switch from `memmap` to `memmap2`.

See https://rustsec.org/advisories/RUSTSEC-2020-0077
---
 Cargo.lock                                 | 18 ++++--------------
 cranelift/filetests/Cargo.toml             |  2 +-
 cranelift/filetests/src/function_runner.rs |  2 +-
 cranelift/jit/Cargo.toml                   |  4 ++--
 cranelift/jit/src/memory.rs                |  2 +-
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72b0b738fc..dcd4cfb463 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -572,7 +572,7 @@ dependencies = [
  "filecheck",
  "gimli",
  "log",
- "memmap",
+ "memmap2",
  "num_cpus",
  "target-lexicon",
  "thiserror",
@@ -616,7 +616,7 @@ dependencies = [
  "errno",
  "libc",
  "log",
- "memmap",
+ "memmap2",
  "region",
  "target-lexicon",
  "winapi",
@@ -1533,21 +1533,11 @@ version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "memmap2"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee"
+checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6"
 dependencies = [
  "libc",
 ]
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
index 5313582747..8687ae700e 100644
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -21,7 +21,7 @@ file-per-thread-logger = "0.1.2"
 filecheck = "0.5.0"
 gimli = { version = "0.23.0", default-features = false, features = ["read"] }
 log = "0.4.6"
-memmap = "0.7.0"
+memmap2 = "0.2.1"
 num_cpus = "1.8.0"
 target-lexicon = "0.11"
 thiserror = "1.0.15"
diff --git a/cranelift/filetests/src/function_runner.rs b/cranelift/filetests/src/function_runner.rs
index 01ddc1f3dd..446dc589ed 100644
--- a/cranelift/filetests/src/function_runner.rs
+++ b/cranelift/filetests/src/function_runner.rs
@@ -9,7 +9,7 @@ use cranelift_codegen::{ir, settings, CodegenError, Context};
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
 use cranelift_native::builder as host_isa_builder;
 use log::trace;
-use memmap::{Mmap, MmapMut};
+use memmap2::{Mmap, MmapMut};
 use std::cmp::max;
 use std::collections::HashMap;
 use thiserror::Error;
diff --git a/cranelift/jit/Cargo.toml b/cranelift/jit/Cargo.toml
index 4762d5d519..dec30ed6dc 100644
--- a/cranelift/jit/Cargo.toml
+++ b/cranelift/jit/Cargo.toml
@@ -19,14 +19,14 @@ region = "2.2.0"
 libc = { version = "0.2.42" }
 errno = "0.2.4"
 target-lexicon = "0.11"
-memmap = { version = "0.7.0", optional = true }
+memmap2 = { version = "0.2.1", optional = true }
 log = { version = "0.4.6", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["winbase", "memoryapi"] }
 
 [features]
-selinux-fix = ['memmap']
+selinux-fix = ['memmap2']
 default = []
 
 [dev-dependencies]
diff --git a/cranelift/jit/src/memory.rs b/cranelift/jit/src/memory.rs
index 0b8ae5021d..b85d231185 100644
--- a/cranelift/jit/src/memory.rs
+++ b/cranelift/jit/src/memory.rs
@@ -5,7 +5,7 @@ use errno;
 use libc;
 
 #[cfg(feature = "selinux-fix")]
-use memmap::MmapMut;
+use memmap2::MmapMut;
 
 use region;
 use std::convert::TryFrom;