bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83236 - cjgillot:memmap, r=joshtriplett

Browse source 
Upgrade memmap to memmap2

memmap is no longer maintained. memmap2 is a fork that is still maintained. https://rustsec.org/advisories/RUSTSEC-2020-0077.html

The remaining use of memmap is through measureme.
This commit is contained in:
Dylan DPC 2021-03-19 15:03:28 +01:00 • committed by GitHub
commit 23128c4183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_metadata/Cargo.toml
View file

@ -11,7 +11,7 @@ doctest = false
libc = "0.2"
snap = "1"
tracing = "0.1"
memmap = "0.7"
memmap2 = "0.2.1"
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
rustc_middle = { path = "../rustc_middle" }
rustc_attr = { path = "../rustc_attr" }

4
compiler/rustc_metadata/src/locator.rs
View file

@ -728,7 +728,7 @@ impl<'a> CrateLocator<'a> {
}
/// A trivial wrapper for `Mmap` that implements `StableDeref`.
struct StableDerefMmap(memmap::Mmap);
struct StableDerefMmap(memmap2::Mmap);
impl Deref for StableDerefMmap {
type Target = [u8];
@ -779,7 +779,7 @@ fn get_metadata_section(
// mmap the file, because only a small fraction of it is read.
let file = std::fs::File::open(filename)
.map_err(|_| format!("failed to open rmeta metadata: '{}'", filename.display()))?;
let mmap = unsafe { memmap::Mmap::map(&file) };
let mmap = unsafe { memmap2::Mmap::map(&file) };
let mmap = mmap
.map_err(|_| format!("failed to mmap rmeta metadata: '{}'", filename.display()))?;