aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurenČ›iu Nicola <[email protected]>2021-05-24 14:35:23 +0100
committerLaurenČ›iu Nicola <[email protected]>2021-05-24 14:35:23 +0100
commitd525cfc85a0fe798a85036543ccfa8858c4fbc04 (patch)
tree23a7a2ea2078c05b82df62cad68ca87966ae0512
parent47afa4a5fc18eb84c4838848f02eca655b0256d9 (diff)
Bump object
-rw-r--r--Cargo.lock12
-rw-r--r--crates/proc_macro_api/Cargo.toml2
-rw-r--r--crates/proc_macro_srv/Cargo.toml2
-rw-r--r--crates/proc_macro_srv/src/dylib.rs2
4 files changed, 6 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock
index bc3709d55..0b51ce6af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,7 +81,7 @@ dependencies = [
81 "cfg-if", 81 "cfg-if",
82 "libc", 82 "libc",
83 "miniz_oxide", 83 "miniz_oxide",
84 "object 0.24.0", 84 "object",
85 "rustc-demangle", 85 "rustc-demangle",
86] 86]
87 87
@@ -995,12 +995,6 @@ dependencies = [
995 995
996[[package]] 996[[package]]
997name = "object" 997name = "object"
998version = "0.23.0"
999source = "registry+https://github.com/rust-lang/crates.io-index"
1000checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
1001
1002[[package]]
1003name = "object"
1004version = "0.24.0" 998version = "0.24.0"
1005source = "registry+https://github.com/rust-lang/crates.io-index" 999source = "registry+https://github.com/rust-lang/crates.io-index"
1006checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" 1000checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
@@ -1146,7 +1140,7 @@ dependencies = [
1146 "jod-thread", 1140 "jod-thread",
1147 "log", 1141 "log",
1148 "memmap2", 1142 "memmap2",
1149 "object 0.23.0", 1143 "object",
1150 "profile", 1144 "profile",
1151 "serde", 1145 "serde",
1152 "serde_json", 1146 "serde_json",
@@ -1163,7 +1157,7 @@ dependencies = [
1163 "libloading", 1157 "libloading",
1164 "mbe", 1158 "mbe",
1165 "memmap2", 1159 "memmap2",
1166 "object 0.23.0", 1160 "object",
1167 "proc_macro_api", 1161 "proc_macro_api",
1168 "proc_macro_test", 1162 "proc_macro_test",
1169 "serde_derive", 1163 "serde_derive",
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml
index 2ce5eeedd..6fa880d61 100644
--- a/crates/proc_macro_api/Cargo.toml
+++ b/crates/proc_macro_api/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4.8"
16crossbeam-channel = "0.5.0" 16crossbeam-channel = "0.5.0"
17jod-thread = "0.1.1" 17jod-thread = "0.1.1"
18memmap2 = "0.2.0" 18memmap2 = "0.2.0"
19object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } 19object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] }
20snap = "1.0" 20snap = "1.0"
21 21
22tt = { path = "../tt", version = "0.0.0" } 22tt = { path = "../tt", version = "0.0.0" }
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 63b3f1532..4ea41175e 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
10doctest = false 10doctest = false
11 11
12[dependencies] 12[dependencies]
13object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] } 13object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
14libloading = "0.7.0" 14libloading = "0.7.0"
15memmap2 = "0.2.0" 15memmap2 = "0.2.0"
16 16
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index baf10fea9..cccc53220 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -27,7 +27,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> {
27 let file = File::open(file)?; 27 let file = File::open(file)?;
28 let buffer = unsafe { Mmap::map(&file)? }; 28 let buffer = unsafe { Mmap::map(&file)? };
29 29
30 Ok(object::File::parse(&buffer) 30 Ok(object::File::parse(&*buffer)
31 .map_err(invalid_data_err)? 31 .map_err(invalid_data_err)?
32 .exports() 32 .exports()
33 .map_err(invalid_data_err)? 33 .map_err(invalid_data_err)?