diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-04 04:41:48 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-05-04 04:41:48 +0100 |
commit | 2350b3f05f96a4a9ed81dc5bde246a1ef1d0da41 (patch) | |
tree | df6f208332dee0917944e96265432d70b209b271 /crates | |
parent | a0ec841bfee8ee70a9dbc25203875a3a94ba6c4f (diff) | |
parent | 27ba1dd8e32eac77f23fd23f4f8685604d3027a2 (diff) |
Merge #8716
8716: Replace `memmap` with `memmap2` in `proc_macro_api` r=edwin0cheng a=memoryruins
#7522 did the same for `proc_macro_srv` before this usage of `memmap` was introduced to `proc_macro_api` in #6822 .
Something like [`cargo-deny`](https://github.com/EmbarkStudios/cargo-deny-action) could help prevent specific crates (and versions, licenses, etc) from being introduced into the crate tree, but that's unrelated to this pull request.
Co-authored-by: memoryruins <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/proc_macro_api/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/proc_macro_api/src/version.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml index 1ba1e4abd..2ce5eeedd 100644 --- a/crates/proc_macro_api/Cargo.toml +++ b/crates/proc_macro_api/Cargo.toml | |||
@@ -15,7 +15,7 @@ serde_json = { version = "1.0", features = ["unbounded_depth"] } | |||
15 | log = "0.4.8" | 15 | log = "0.4.8" |
16 | crossbeam-channel = "0.5.0" | 16 | crossbeam-channel = "0.5.0" |
17 | jod-thread = "0.1.1" | 17 | jod-thread = "0.1.1" |
18 | memmap = "0.7.0" | 18 | memmap2 = "0.2.0" |
19 | object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } | 19 | object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } |
20 | snap = "1.0" | 20 | snap = "1.0" |
21 | 21 | ||
diff --git a/crates/proc_macro_api/src/version.rs b/crates/proc_macro_api/src/version.rs index dcf8fae8f..6dbac50b4 100644 --- a/crates/proc_macro_api/src/version.rs +++ b/crates/proc_macro_api/src/version.rs | |||
@@ -6,7 +6,7 @@ use std::{ | |||
6 | path::Path, | 6 | path::Path, |
7 | }; | 7 | }; |
8 | 8 | ||
9 | use memmap::Mmap; | 9 | use memmap2::Mmap; |
10 | use object::read::{File as BinaryFile, Object, ObjectSection}; | 10 | use object::read::{File as BinaryFile, Object, ObjectSection}; |
11 | use snap::read::FrameDecoder as SnapDecoder; | 11 | use snap::read::FrameDecoder as SnapDecoder; |
12 | 12 | ||