From 6608acef719ea201d8d6ce9df7d8907aa770c959 Mon Sep 17 00:00:00 2001 From: Jay Somedon Date: Fri, 11 Dec 2020 22:14:42 +0800 Subject: Read version of rustc that compiled proc macro With Jay Somedon --- Cargo.lock | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 799127891..b61fd2e98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.23.0", "rustc-demangle", ] @@ -1008,6 +1008,16 @@ dependencies = [ "libc", ] +[[package]] +name = "object" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +dependencies = [ + "flate2", + "wasmparser", +] + [[package]] name = "object" version = "0.23.0" @@ -1154,8 +1164,10 @@ dependencies = [ "crossbeam-channel", "jod-thread", "log", + "object 0.22.0", "serde", "serde_json", + "snap", "stdx", "tt", ] @@ -1168,7 +1180,7 @@ dependencies = [ "libloading", "mbe", "memmap2", - "object", + "object 0.23.0", "proc_macro_api", "proc_macro_test", "serde_derive", @@ -1540,6 +1552,12 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc725476a1398f0480d56cd0ad381f6f32acf2642704456f8f59a35df464b59a" + [[package]] name = "socket2" version = "0.3.19" @@ -1880,6 +1898,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "wasmparser" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" + [[package]] name = "winapi" version = "0.3.9" -- cgit v1.2.3 From 55d73bc6754c351dead6ab4d4b57ddaa347734d6 Mon Sep 17 00:00:00 2001 From: Jay Somedon Date: Wed, 23 Dec 2020 21:24:53 +0800 Subject: Fix multiple issues from code review * check metadata version * use memmap * use Result instead of unwrap with Jay Somedon --- Cargo.lock | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index b61fd2e98..39f43ba17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.23.0", + "object", "rustc-demangle", ] @@ -891,6 +891,16 @@ 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.1" @@ -1008,16 +1018,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" -dependencies = [ - "flate2", - "wasmparser", -] - [[package]] name = "object" version = "0.23.0" @@ -1164,7 +1164,8 @@ dependencies = [ "crossbeam-channel", "jod-thread", "log", - "object 0.22.0", + "memmap", + "object", "serde", "serde_json", "snap", @@ -1180,7 +1181,7 @@ dependencies = [ "libloading", "mbe", "memmap2", - "object 0.23.0", + "object", "proc_macro_api", "proc_macro_test", "serde_derive", @@ -1898,12 +1899,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasmparser" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" - [[package]] name = "winapi" version = "0.3.9" -- cgit v1.2.3