Skip to content

Commit

Permalink
bump to 0.4.1 and refine some dependencies
Browse files Browse the repository at this point in the history
There were some problems when trying to publish the crates due to parity-wasm versions differing in
our crates and Cranelift's. I went through and updated and/or fixed the versions of some crates that
look like they could've caused trouble.
  • Loading branch information
acfoltzer committed Oct 31, 2019
1 parent 588b899 commit 4d12bc6
Show file tree
Hide file tree
Showing 15 changed files with 403 additions and 389 deletions.
687 changes: 351 additions & 336 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions benchmarks/lucet-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-benchmarks"
version = "0.4.0"
version = "0.4.1"
description = "Benchmarks for the Lucet runtime"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -10,7 +10,7 @@ authors = ["Lucet team <[email protected]>"]
edition = "2018"

[dependencies]
criterion = "0.2"
criterion = "0.3.0"
lucetc = { path = "../../lucetc" }
lucet-module = { path = "../../lucet-module" }
lucet-runtime = { path = "../../lucet-runtime" }
Expand Down
2 changes: 1 addition & 1 deletion cranelift
2 changes: 1 addition & 1 deletion lucet-builtins/wasmonkey/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clap = "2.33"
failure = "0.1"
goblin = "0.0.24"
lazy_static = "1.3"
parity-wasm = "0.38"
parity-wasm = "0.40.3"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions lucet-module/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-module"
version = "0.4.0"
version = "0.4.1"
description = "A structured interface for Lucet modules"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -15,9 +15,9 @@ failure = "0.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
bincode = "1.1.4"
num-derive = "0.2"
num-traits = "0.2"
num-derive = "0.3.0"
num-traits = "0.2.8"
minisign = "0.5.11"
object = "0.12"
object = "0.14.0"
byteorder = "1.3"
memoffset = "0.5.1"
6 changes: 3 additions & 3 deletions lucet-objdump/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-objdump"
version = "0.4.0"
version = "0.4.1"
description = "Analyze object files emitted by the Lucet compiler"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -12,8 +12,8 @@ edition = "2018"
[dependencies]
goblin="0.0.24"
byteorder="1.2.1"
colored="1.6.1"
lucet-module = { path = "../lucet-module", version = "0.4.0" }
colored="1.8.0"
lucet-module = { path = "../lucet-module", version = "0.4.1" }

[package.metadata.deb]
name = "fst-lucet-objdump"
Expand Down
14 changes: 7 additions & 7 deletions lucet-runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-runtime"
version = "0.4.0"
version = "0.4.1"
description = "Pure Rust runtime for Lucet WebAssembly toolchain"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -11,18 +11,18 @@ edition = "2018"

[dependencies]
libc = "=0.2.59"
lucet-runtime-internals = { path = "lucet-runtime-internals", version = "0.4.0" }
lucet-module = { path = "../lucet-module", version = "0.4.0" }
lucet-runtime-internals = { path = "lucet-runtime-internals", version = "0.4.1" }
lucet-module = { path = "../lucet-module", version = "0.4.1" }
num-traits = "0.2"
num-derive = "0.2"
num-derive = "0.3.0"

[dev-dependencies]
byteorder = "1.2"
failure = "0.1"
lazy_static = "1.1"
lucetc = { path = "../lucetc", version = "0.4.0" }
lucet-runtime-tests = { path = "lucet-runtime-tests", version = "0.4.0" }
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.0" }
lucetc = { path = "../lucetc", version = "0.4.1" }
lucet-runtime-tests = { path = "lucet-runtime-tests", version = "0.4.1" }
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.1" }
nix = "0.13"
rayon = "1.0"
tempfile = "3.0"
Expand Down
8 changes: 4 additions & 4 deletions lucet-runtime/lucet-runtime-internals/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-runtime-internals"
version = "0.4.0"
version = "0.4.1"
description = "Pure Rust runtime for Lucet WebAssembly toolchain (internals)"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -10,7 +10,7 @@ authors = ["Lucet team <[email protected]>"]
edition = "2018"

[dependencies]
lucet-module = { path = "../../lucet-module", version = "0.4.0" }
lucet-module = { path = "../../lucet-module", version = "0.4.1" }

bitflags = "1.0"
bincode = "1.1.4"
Expand All @@ -21,10 +21,10 @@ libc = "=0.2.59"
libloading = "0.5"
memoffset = "0.5.1"
nix = "0.13"
num-derive = "0.2"
num-derive = "0.3.0"
num-traits = "0.2"
xfailure = "0.1"
raw-cpuid = "7.0.3"
raw-cpuid = "6.0.0"

# This is only a dependency to ensure that other crates don't pick a newer version as a transitive
# dependency. `0.1.3 < getrandom <= 0.1.6` cause `lazy_static` to pull in spinlock implementations
Expand Down
10 changes: 5 additions & 5 deletions lucet-runtime/lucet-runtime-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-runtime-tests"
version = "0.4.0"
version = "0.4.1"
description = "Pure Rust runtime for Lucet WebAssembly toolchain (tests)"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -18,10 +18,10 @@ test = false
failure = "0.1"
lazy_static = "1.1"
tempfile = "3.0"
lucet-module = { path = "../../lucet-module", version = "0.4.0" }
lucet-runtime-internals = { path = "../lucet-runtime-internals", version = "0.4.0" }
lucet-wasi-sdk = { path = "../../lucet-wasi-sdk", version = "0.4.0" }
lucetc = { path = "../../lucetc", version = "0.4.0" }
lucet-module = { path = "../../lucet-module", version = "0.4.1" }
lucet-runtime-internals = { path = "../lucet-runtime-internals", version = "0.4.1" }
lucet-wasi-sdk = { path = "../../lucet-wasi-sdk", version = "0.4.1" }
lucetc = { path = "../../lucetc", version = "0.4.1" }

[build-dependencies]
cc = "1.0"
8 changes: 4 additions & 4 deletions lucet-spectest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-spectest"
version = "0.4.0"
version = "0.4.1"
description = "Test harness to run WebAssembly spec tests (.wast) against the Lucet toolchain"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -17,9 +17,9 @@ name = "spec-test"
path = "src/main.rs"

[dependencies]
lucetc = { path = "../lucetc", version = "0.4.0" }
lucet-module = { path = "../lucet-module", version = "0.4.0" }
lucet-runtime = { path = "../lucet-runtime", version = "0.4.0" }
lucetc = { path = "../lucetc", version = "0.4.1" }
lucet-module = { path = "../lucet-module", version = "0.4.1" }
lucet-runtime = { path = "../lucet-runtime", version = "0.4.1" }
wabt = "0.9.2"
serde = "1.0"
serde_json = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions lucet-validate/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-validate"
version = "0.4.0"
version = "0.4.1"
description = "Parse and validate webassembly files against witx interface"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -24,7 +24,7 @@ cranelift-entity = { path = "../cranelift/cranelift-entity", version = "0.46.1"
wasmparser = "0.39.1"

[dev-dependencies]
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.0" }
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.1" }
tempfile = "3.0"
wabt = "0.9.2"

Expand Down
4 changes: 2 additions & 2 deletions lucet-wasi-fuzz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-wasi-fuzz"
version = "0.4.0"
version = "0.4.1"
description = "Test the Lucet toolchain against native code execution using Csmith"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -24,6 +24,6 @@ progress = "0.2"
rand = "0.6"
regex = "1.1"
rayon = "1.0"
structopt = "0.2"
structopt = "0.3.3"
tempfile = "3.0"
wait-timeout = "0.2"
8 changes: 4 additions & 4 deletions lucet-wasi-sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-wasi-sdk"
version = "0.4.0"
version = "0.4.1"
description = "A Rust interface to the wasi-sdk compiler and linker"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -11,9 +11,9 @@ edition = "2018"

[dependencies]
failure = "0.1"
lucetc = { path = "../lucetc", version = "0.4.0" }
lucet-module = { path = "../lucet-module", version = "0.4.0" }
lucetc = { path = "../lucetc", version = "0.4.1" }
lucet-module = { path = "../lucet-module", version = "0.4.1" }
tempfile = "3.0"

[dev-dependencies]
lucet-validate = { path = "../lucet-validate", version = "0.4.0" }
lucet-validate = { path = "../lucet-validate", version = "0.4.1" }
17 changes: 8 additions & 9 deletions lucet-wasi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucet-wasi"
version = "0.4.0"
version = "0.4.1"
description = "Fastly's runtime for the WebAssembly System Interface (WASI)"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand Down Expand Up @@ -29,20 +29,19 @@ clap = "2.23"
failure = "0.1"
human-size = "0.4"
libc = "=0.2.59"
lucet-runtime = { path = "../lucet-runtime", version = "0.4.0" }
lucet-runtime-internals = { path = "../lucet-runtime/lucet-runtime-internals", version = "0.4.0" }
lucet-module = { path = "../lucet-module", version = "0.4.0" }
lucet-runtime = { path = "../lucet-runtime", version = "0.4.1" }
lucet-runtime-internals = { path = "../lucet-runtime/lucet-runtime-internals", version = "0.4.1" }
lucet-module = { path = "../lucet-module", version = "0.4.1" }
nix = "0.13"
rand = "0.6"

[dev-dependencies]
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.0" }
lucetc = { path = "../lucetc", version = "0.4.0" }
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.1" }
lucetc = { path = "../lucetc", version = "0.4.1" }
tempfile = "3.0"

[build-dependencies.bindgen]
version = "0.47"
optional = true
[build-dependencies]
bindgen = { version = "0.51.1", optional = true }

[lib]
name = "lucet_wasi"
Expand Down
10 changes: 5 additions & 5 deletions lucetc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lucetc"
version = "0.4.0"
version = "0.4.1"
description = "Fastly's WebAssembly to native code compiler"
homepage = "https://github.com/fastly/lucet"
repository = "https://github.com/fastly/lucet"
Expand All @@ -23,8 +23,8 @@ cranelift-module = { path = "../cranelift/cranelift-module", version = "0.46.1"
cranelift-faerie = { path = "../cranelift/cranelift-faerie", version = "0.46.1" }
cranelift-wasm = { path = "../cranelift/cranelift-wasm", version = "0.46.1" }
target-lexicon = "0.8.0"
lucet-module = { path = "../lucet-module", version = "0.4.0" }
lucet-validate = { path = "../lucet-validate", version = "0.4.0" }
lucet-module = { path = "../lucet-module", version = "0.4.1" }
lucet-validate = { path = "../lucet-validate", version = "0.4.1" }
wasmparser = "0.39.1"
clap="2.32"
log = "0.4"
Expand All @@ -38,12 +38,12 @@ wabt = "0.9.2"
tempfile = "3.0"
bimap = "0.2"
human-size = "0.4"
parity-wasm = "0.38"
parity-wasm = "0.40.3"
minisign = "0.5.11"
memoffset = "0.5.1"
serde = "1.0"
serde_json = "1.0"
raw-cpuid = "7.0.3"
raw-cpuid = "6.0.0"

[package.metadata.deb]
name = "fst-lucetc"
Expand Down

0 comments on commit 4d12bc6

Please sign in to comment.