From 0cbcccf4c1022d568a47a3e43c347730126924c2 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 8 Dec 2019 11:51:18 +0100 Subject: [PATCH] Update Cranelift --- Cargo.lock | 40 ++++++++++++++++++++-------------------- Cargo.toml | 6 +----- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9b55797922..25c06fa05eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,7 +66,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cranelift" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-frontend 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "cranelift-bforest" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-entity 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", ] @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-bforest 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -99,7 +99,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen-shared 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-entity 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "packed_struct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "packed_struct_codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -117,12 +117,12 @@ dependencies = [ [[package]] name = "cranelift-entity" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" [[package]] name = "cranelift-faerie" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-module 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -135,7 +135,7 @@ dependencies = [ [[package]] name = "cranelift-frontend" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "cranelift-module" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-entity 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -157,7 +157,7 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -167,18 +167,18 @@ dependencies = [ [[package]] name = "cranelift-object" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-module 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", - "object 0.15.0 (git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056)", + "object 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-simplejit" version = "0.51.0" -source = "git+https://github.com/bytecodealliance/cranelift/#c54fc845c45b2929bdf36635c90a363e380cf805" +source = "git+https://github.com/bytecodealliance/cranelift/#4727b70b67abfa4f3ae1c276454a0da7a76e1d49" dependencies = [ "cranelift-codegen 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-module 0.51.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -347,8 +347,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "object" -version = "0.15.0" -source = "git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056#cba3ed4932e4c594c5eab4f5ef6c51838f4a5056" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -356,7 +356,7 @@ dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -446,7 +446,7 @@ dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "object 0.15.0 (git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056)", + "object 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -596,7 +596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "uuid" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -659,7 +659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -"checksum object 0.15.0 (git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056)" = "" +"checksum object 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a3c61759aa254402e53c79a68dc519cda1ceee2ff2b6d70b3e58bf64ac2f03e3" "checksum packed_struct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90caf80e74380d94f2aabc83edb900b49123b3132442fb147f9155c87a756281" "checksum packed_struct_codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6fda15ebe37b7b28889bd4aa75bb134652eaec9eb99d1bf02f806fca4357fc" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" @@ -688,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum thiserror-impl 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45ba8d810d9c48fc456b7ad54574e8bfb7c7918a57ad7a6e6a0985d7959e8597" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index b6e55b35720..fc06285c566 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,11 +29,7 @@ indexmap = "1.0.2" libloading = "0.5.1" [dependencies.object] -# FIXME remove git and rev once cranelift switches back to a crates.io release of object -git = "https://github.com/gimli-rs/object" -rev = "cba3ed4932e4c594c5eab4f5ef6c51838f4a5056" - -version = "0.15.0" +version = "0.16.0" default-features = false features = ["compression", "read", "std"] # We don't need WASM support