T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to target-lexicon 0.0.2.

Browse Source 
This fixes compilation on rust 1.22.1.
This commit is contained in:
Dan Gohman
2018-06-12 06:36:07 -07:00
parent 1b55a2d005
commit a7813c4448
8 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/Cargo.toml
View File

@@ -31,7 +31,7 @@ serde_derive = "1.0.8"
term = "0.5.1" term = "0.5.1"
capstone = "0.4" capstone = "0.4"
wabt = { version = "0.3", optional = true } wabt = { version = "0.3", optional = true }
target-lexicon = "0.0.1" target-lexicon = "0.0.2"
[features] [features]
default = ["wasm"] default = ["wasm"]

21
cranelift/fuzz/Cargo.toml
View File

@@ -7,21 +7,12 @@ publish = false
[package.metadata] [package.metadata]
cargo-fuzz = true cargo-fuzz = true
[dependencies.cargo-fuzz] [dependencies]
version = "*" cargo-fuzz = "*"
binaryen = { git = "https://github.com/pepyakin/binaryen-rs.git" }
[dependencies.binaryen] libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
git = "https://github.com/pepyakin/binaryen-rs.git" cretonne-wasm = { path = "../lib/wasm" }
version = "*" target-lexicon = "0.0.2"
[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"
# Prevent this from interfering with workspaces # Prevent this from interfering with workspaces
[workspace] [workspace]

2
lib/codegen/Cargo.toml
View File

@@ -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 = { version = "0.1.1", default-features = false, features = ["derive"] }
failure_derive = { version = "0.1.1", default-features = false } failure_derive = { version = "0.1.1", default-features = false }
hashmap_core = { version = "0.1.6", optional = true } 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. # 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 # 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 # machine code. Integration tests that need external dependencies can be

4
lib/faerie/Cargo.toml
View File

@@ -11,10 +11,10 @@ readme = "README.md"
[dependencies] [dependencies]
cretonne-codegen = { path = "../codegen", version = "0.9.0" } cretonne-codegen = { path = "../codegen", version = "0.9.0" }
cretonne-module = { path = "../module", version = "0.9.0" } cretonne-module = { path = "../module", version = "0.9.0" }
faerie = "0.4.1" faerie = "0.4.2"
goblin = "0.0.15" goblin = "0.0.15"
failure = "0.1.1" failure = "0.1.1"
target-lexicon = "0.0.1" target-lexicon = "0.0.2"
[badges] [badges]
maintenance = { status = "experimental" } maintenance = { status = "experimental" }

4
lib/native/Cargo.toml
View File

@@ -9,14 +9,14 @@ readme = "README.md"
[dependencies] [dependencies]
cretonne-codegen = { path = "../codegen", version = "0.9.0", default-features = false } 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] [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
raw-cpuid = "3.1.0" raw-cpuid = "3.1.0"
[features] [features]
default = ["std"] default = ["std"]
std = ["cretonne-codegen/std"] std = ["cretonne-codegen/std", "target-lexicon/std"]
# when compiling with the "core" feature, nightly must be enabled # when compiling with the "core" feature, nightly must be enabled
# enabling the "nightly" feature for raw-cpuid allows avoiding # enabling the "nightly" feature for raw-cpuid allows avoiding
# linking in a c-library. # linking in a c-library.

2
lib/reader/Cargo.toml
View File

@@ -10,7 +10,7 @@ readme = "README.md"
[dependencies] [dependencies]
cretonne-codegen = { path = "../codegen", version = "0.9.0" } cretonne-codegen = { path = "../codegen", version = "0.9.0" }
target-lexicon = "0.0.1" target-lexicon = "0.0.2"
[badges] [badges]
maintenance = { status = "experimental" } maintenance = { status = "experimental" }

4
lib/simplejit/Cargo.toml
View File

@@ -15,14 +15,14 @@ cretonne-native = { path = "../native", version = "0.9.0", default-features = fa
region = "0.3.0" region = "0.3.0"
libc = { version = "0.2.40", default-features = false } libc = { version = "0.2.40", default-features = false }
errno = "0.2.3" 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] [target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["winbase", "memoryapi"] } winapi = { version = "0.3", features = ["winbase", "memoryapi"] }
[features] [features]
default = ["std"] 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"] core = ["cretonne-codegen/core", "cretonne-module/core", "cretonne-native/core"]
[badges] [badges]

2
lib/wasm/Cargo.toml
View File

@@ -15,7 +15,7 @@ cretonne-frontend = { path = "../frontend", version = "0.9.0", default-features
hashmap_core = { version = "0.1.6", optional = true } hashmap_core = { version = "0.1.6", optional = true }
failure = { version = "0.1.1", default-features = false, features = ["derive"] } failure = { version = "0.1.1", default-features = false, features = ["derive"] }
failure_derive = { version = "0.1.1", default-features = false } 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] [dev-dependencies]
wabt = "0.3" wabt = "0.3"