Skip to content

Commit

Permalink
Merge pull request #156 from cjgillot/memmap
Browse files Browse the repository at this point in the history
Update memmap to memmap2.
  • Loading branch information
wesleywiser authored Mar 19, 2021
2 parents dcf12b4 + 99ce27b commit d5050c0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion measureme/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ smallvec = "1.0"
nightly = []

[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dependencies]
memmap = "0.7"
memmap2 = "0.2.1"
perf-event-open-sys = "1.0.1"
2 changes: 1 addition & 1 deletion measureme/src/counters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ const BUG_REPORT_MSG: &str =
/// Linux x86_64 implementation based on `perf_event_open` and `rdpmc`.
#[cfg(all(feature = "nightly", target_arch = "x86_64", target_os = "linux"))]
mod hw {
use memmap::{Mmap, MmapOptions};
use memmap2::{Mmap, MmapOptions};
use perf_event_open_sys::{bindings::*, perf_event_open};
use std::convert::TryInto;
use std::error::Error;
Expand Down

0 comments on commit d5050c0

Please sign in to comment.