From a7813c4448853cbf627463536cdbc7ec98b23ed8 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 12 Jun 2018 06:36:07 -0700 Subject: [PATCH] Update to target-lexicon 0.0.2. This fixes compilation on rust 1.22.1. --- cranelift/Cargo.toml | 2 +- cranelift/fuzz/Cargo.toml | 21 ++++++--------------- lib/codegen/Cargo.toml | 2 +- lib/faerie/Cargo.toml | 4 ++-- lib/native/Cargo.toml | 4 ++-- lib/reader/Cargo.toml | 2 +- lib/simplejit/Cargo.toml | 4 ++-- lib/wasm/Cargo.toml | 2 +- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index 6be8f607bb..c0d22b0b4d 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -31,7 +31,7 @@ serde_derive = "1.0.8" term = "0.5.1" capstone = "0.4" wabt = { version = "0.3", optional = true } -target-lexicon = "0.0.1" +target-lexicon = "0.0.2" [features] default = ["wasm"] diff --git a/cranelift/fuzz/Cargo.toml b/cranelift/fuzz/Cargo.toml index a5bbdbd912..dcda236717 100644 --- a/cranelift/fuzz/Cargo.toml +++ b/cranelift/fuzz/Cargo.toml @@ -7,21 +7,12 @@ publish = false [package.metadata] cargo-fuzz = true -[dependencies.cargo-fuzz] -version = "*" - -[dependencies.binaryen] -git = "https://github.com/pepyakin/binaryen-rs.git" -version = "*" - -[dependencies.libfuzzer-sys] -git = "https://github.com/rust-fuzz/libfuzzer-sys.git" - -[dependencies.cretonne-wasm] -path = "../lib/wasm" - -[dependencies.target-lexicon] -version = "0.0.1" +[dependencies] +cargo-fuzz = "*" +binaryen = { git = "https://github.com/pepyakin/binaryen-rs.git" } +libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } +cretonne-wasm = { path = "../lib/wasm" } +target-lexicon = "0.0.2" # Prevent this from interfering with workspaces [workspace] diff --git a/lib/codegen/Cargo.toml b/lib/codegen/Cargo.toml index 7a6f76a85a..052e61c46c 100644 --- a/lib/codegen/Cargo.toml +++ b/lib/codegen/Cargo.toml @@ -15,7 +15,7 @@ cretonne-entity = { path = "../entity", version = "0.9.0", default-features = fa failure = { version = "0.1.1", default-features = false, features = ["derive"] } failure_derive = { version = "0.1.1", default-features = false } hashmap_core = { version = "0.1.6", optional = true } -target-lexicon = { version = "0.0.1", default-features = false } +target-lexicon = { version = "0.0.2", default-features = false } # It is a goal of the cretonne-codegen crate to have minimal external dependencies. # Please don't add any unless they are essential to the task of creating binary # machine code. Integration tests that need external dependencies can be diff --git a/lib/faerie/Cargo.toml b/lib/faerie/Cargo.toml index 886a5222a6..d37dd8e2f7 100644 --- a/lib/faerie/Cargo.toml +++ b/lib/faerie/Cargo.toml @@ -11,10 +11,10 @@ readme = "README.md" [dependencies] cretonne-codegen = { path = "../codegen", version = "0.9.0" } cretonne-module = { path = "../module", version = "0.9.0" } -faerie = "0.4.1" +faerie = "0.4.2" goblin = "0.0.15" failure = "0.1.1" -target-lexicon = "0.0.1" +target-lexicon = "0.0.2" [badges] maintenance = { status = "experimental" } diff --git a/lib/native/Cargo.toml b/lib/native/Cargo.toml index 733016df77..502b4b757e 100644 --- a/lib/native/Cargo.toml +++ b/lib/native/Cargo.toml @@ -9,14 +9,14 @@ readme = "README.md" [dependencies] cretonne-codegen = { path = "../codegen", version = "0.9.0", default-features = false } -target-lexicon = { version = "0.0.1", default-features = false } +target-lexicon = { version = "0.0.2", default-features = false } [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] raw-cpuid = "3.1.0" [features] default = ["std"] -std = ["cretonne-codegen/std"] +std = ["cretonne-codegen/std", "target-lexicon/std"] # when compiling with the "core" feature, nightly must be enabled # enabling the "nightly" feature for raw-cpuid allows avoiding # linking in a c-library. diff --git a/lib/reader/Cargo.toml b/lib/reader/Cargo.toml index a57971e963..3c3064f0a3 100644 --- a/lib/reader/Cargo.toml +++ b/lib/reader/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] cretonne-codegen = { path = "../codegen", version = "0.9.0" } -target-lexicon = "0.0.1" +target-lexicon = "0.0.2" [badges] maintenance = { status = "experimental" } diff --git a/lib/simplejit/Cargo.toml b/lib/simplejit/Cargo.toml index bf23dfb8f0..34953956c2 100644 --- a/lib/simplejit/Cargo.toml +++ b/lib/simplejit/Cargo.toml @@ -15,14 +15,14 @@ cretonne-native = { path = "../native", version = "0.9.0", default-features = fa region = "0.3.0" libc = { version = "0.2.40", default-features = false } errno = "0.2.3" -target-lexicon = { version = "0.0.1", default-features = false } +target-lexicon = { version = "0.0.2", default-features = false } [target.'cfg(target_os = "windows")'.dependencies] winapi = { version = "0.3", features = ["winbase", "memoryapi"] } [features] default = ["std"] -std = ["libc/use_std", "cretonne-codegen/std", "cretonne-module/std", "cretonne-native/std"] +std = ["libc/use_std", "cretonne-codegen/std", "cretonne-module/std", "cretonne-native/std", "target-lexicon/std"] core = ["cretonne-codegen/core", "cretonne-module/core", "cretonne-native/core"] [badges] diff --git a/lib/wasm/Cargo.toml b/lib/wasm/Cargo.toml index 60fa48a776..8d5a67c013 100644 --- a/lib/wasm/Cargo.toml +++ b/lib/wasm/Cargo.toml @@ -15,7 +15,7 @@ cretonne-frontend = { path = "../frontend", version = "0.9.0", default-features hashmap_core = { version = "0.1.6", optional = true } failure = { version = "0.1.1", default-features = false, features = ["derive"] } failure_derive = { version = "0.1.1", default-features = false } -target-lexicon = { version = "0.0.1", default-features = false } +target-lexicon = { version = "0.0.2", default-features = false } [dev-dependencies] wabt = "0.3"