Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit 17eccea

Browse files
author
Pat Hickey
authored
Merge pull request #284 from fastly/pch/faerie_0.11.0
upgrade to Faerie 0.11
2 parents 13f4c6d + 6fd3066 commit 17eccea

7 files changed

Lines changed: 82 additions & 89 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "cranelift"]
22
path = cranelift
33
url = https://github.com/cranestation/cranelift
4-
[submodule "faerie"]
5-
path = faerie
6-
url = https://github.com/m4b/faerie
74
[submodule "lucet-spectest/spec"]
85
path = lucet-spectest/spec
96
url = https://github.com/webassembly/spec

Cargo.lock

Lines changed: 69 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ exclude = ["cranelift"]
2222

2323
[profile.test]
2424
rpath = true
25-
26-
[replace]
27-
"faerie:0.10.1" = { path = "faerie" }

cranelift

faerie

Lines changed: 0 additions & 1 deletion
This file was deleted.

lucet-module/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ authors = ["Lucet team <lucet@fastly.com>"]
1010
edition = "2018"
1111

1212
[dependencies]
13-
cranelift-entity = { path = "../cranelift/cranelift-entity", version = "0.40.0" }
13+
cranelift-entity = { path = "../cranelift/cranelift-entity", version = "0.41.0" }
1414
# We only depend on the types in codegen used inside ir::Signature. TODO: make
1515
# a lucet-module version of those types, and make lucetc responsible for translating
1616
# from the cranelift-codegen::ir::Signature to a lucet-module::Signature
17-
cranelift-codegen = { path = "../cranelift/cranelift-codegen", version = "0.40.0" }
17+
cranelift-codegen = { path = "../cranelift/cranelift-codegen", version = "0.41.0" }
1818
failure = "0.1"
1919
serde = { version = "1.0", features = ["derive"] }
2020
serde_json = "1.0"

lucetc/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ path = "src/main.rs"
1818

1919
[dependencies]
2020
bincode = "1.1.4"
21-
cranelift-codegen = { path = "../cranelift/cranelift-codegen", version = "0.40.0" }
22-
cranelift-entity = { path = "../cranelift/cranelift-entity", version = "0.40.0" }
23-
cranelift-native = { path = "../cranelift/cranelift-native", version = "0.40.0" }
24-
cranelift-frontend = { path = "../cranelift/cranelift-frontend", version = "0.40.0" }
25-
cranelift-module = { path = "../cranelift/cranelift-module", version = "0.40.0" }
26-
cranelift-faerie = { path = "../cranelift/cranelift-faerie", version = "0.40.0" }
27-
cranelift-wasm = { path = "../cranelift/cranelift-wasm", version = "0.40.0" }
28-
target-lexicon = "0.4.0"
21+
cranelift-codegen = { path = "../cranelift/cranelift-codegen", version = "0.41.0" }
22+
cranelift-entity = { path = "../cranelift/cranelift-entity", version = "0.41.0" }
23+
cranelift-native = { path = "../cranelift/cranelift-native", version = "0.41.0" }
24+
cranelift-frontend = { path = "../cranelift/cranelift-frontend", version = "0.41.0" }
25+
cranelift-module = { path = "../cranelift/cranelift-module", version = "0.41.0" }
26+
cranelift-faerie = { path = "../cranelift/cranelift-faerie", version = "0.41.0" }
27+
cranelift-wasm = { path = "../cranelift/cranelift-wasm", version = "0.41.0" }
28+
target-lexicon = "0.8.0"
2929
lucet-module = { path = "../lucet-module", version = "0.1.1" }
30-
wasmparser = "0.36.0"
30+
wasmparser = "0.37.0"
3131
clap="2.32"
3232
log = "0.4"
3333
env_logger = "0.6"
34-
faerie = "0.10.0"
34+
faerie = "0.11.0"
3535
goblin = "0.0.22"
3636
failure = "0.1"
3737
byteorder = "1.2"

0 commit comments

Comments
 (0)