From 5f1cba0b7f90e3604b3dfb83119b09c242f8d3e5 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 25 Feb 2020 10:59:59 -0800 Subject: [PATCH] Hook up all crates via path dependencies --- Cargo.lock | 82 ++++++++++++++++++++++--------- cranelift/Cargo.toml | 32 ++++++------ cranelift/bforest/Cargo.toml | 2 +- cranelift/codegen/Cargo.toml | 4 +- cranelift/codegen/meta/Cargo.toml | 2 +- cranelift/faerie/Cargo.toml | 4 +- cranelift/filetests/Cargo.toml | 8 +-- cranelift/frontend/Cargo.toml | 2 +- cranelift/fuzz/Cargo.toml | 6 +-- cranelift/module/Cargo.toml | 4 +- cranelift/native/Cargo.toml | 2 +- cranelift/object/Cargo.toml | 4 +- cranelift/preopt/Cargo.toml | 4 +- cranelift/reader/Cargo.toml | 2 +- cranelift/serde/Cargo.toml | 4 +- cranelift/simplejit/Cargo.toml | 12 ++--- cranelift/umbrella/Cargo.toml | 4 +- cranelift/wasm/Cargo.toml | 6 +-- crates/environ/Cargo.toml | 8 +-- crates/jit/Cargo.toml | 10 ++-- crates/lightbeam/Cargo.toml | 2 +- 21 files changed, 117 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1df0ef9d1b..3a4b15a1f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,6 +6,15 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +[[package]] +name = "ahash" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" +dependencies = [ + "const-random", +] + [[package]] name = "aho-corasick" version = "0.7.8" @@ -68,6 +77,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + [[package]] name = "autocfg" version = "1.0.0" @@ -305,6 +320,26 @@ dependencies = [ "cc", ] +[[package]] +name = "const-random" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" +dependencies = [ + "getrandom", + "proc-macro-hack", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -324,8 +359,6 @@ dependencies = [ [[package]] name = "cranelift-bforest" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a9c21f8042b9857bda93f6c1910b9f9f24100187a3d3d52f214a34e3dc5818" dependencies = [ "cranelift-entity", ] @@ -333,8 +366,6 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7853f77a6e4a33c67a69c40f5e1bb982bd2dc5c4a22e17e67b65bbccf9b33b2e" dependencies = [ "byteorder", "cranelift-bforest", @@ -342,6 +373,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "gimli", + "hashbrown", "log", "serde", "smallvec", @@ -352,8 +384,6 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084cd6d5fb0d1da28acd72c199471bfb09acc703ec8f3bf07b1699584272a3b9" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -362,14 +392,10 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "701b599783305a58c25027a4d73f2d6b599b2d8ef3f26677275f480b4d51e05d" [[package]] name = "cranelift-entity" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88e792b28e1ebbc0187b72ba5ba880dad083abe9231a99d19604d10c9e73f38" dependencies = [ "serde", ] @@ -377,10 +403,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518344698fa6c976d853319218415fdfb4f1bc6b42d0b2e2df652e55dff1f778" dependencies = [ "cranelift-codegen", + "hashbrown", "log", "smallvec", "target-lexicon", @@ -389,8 +414,6 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32daf082da21c0c05d93394ff4842c2ab7c4991b1f3186a1d952f8ac660edd0b" dependencies = [ "cranelift-codegen", "raw-cpuid", @@ -400,16 +423,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2aa816f554a3ef739a5d17ca3081a1f8983f04c944ea8ff60fb8d9dd8cd2d7b" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", + "hashbrown", "log", "serde", + "target-lexicon", "thiserror", "wasmparser 0.51.2", + "wat", ] [[package]] @@ -438,7 +462,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg", + "autocfg 1.0.0", "cfg-if", "crossbeam-utils", "lazy_static", @@ -463,7 +487,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg", + "autocfg 1.0.0", "cfg-if", "lazy_static", ] @@ -776,6 +800,16 @@ dependencies = [ "scroll", ] +[[package]] +name = "hashbrown" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" +dependencies = [ + "ahash", + "autocfg 0.1.7", +] + [[package]] name = "heck" version = "0.3.1" @@ -815,7 +849,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" dependencies = [ - "autocfg", + "autocfg 1.0.0", ] [[package]] @@ -1053,7 +1087,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg", + "autocfg 1.0.0", "num-traits", ] @@ -1063,7 +1097,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" dependencies = [ - "autocfg", + "autocfg 1.0.0", "num-traits", ] @@ -1073,7 +1107,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" dependencies = [ - "autocfg", + "autocfg 1.0.0", "num-integer", "num-traits", ] @@ -1084,7 +1118,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" dependencies = [ - "autocfg", + "autocfg 1.0.0", "num-integer", "num-traits", ] @@ -1095,7 +1129,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" dependencies = [ - "autocfg", + "autocfg 1.0.0", ] [[package]] diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index c93d53c9a0..a1836037ec 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -9,30 +9,26 @@ repository = "https://github.com/bytecodealliance/cranelift" publish = false edition = "2018" -# Present here only to make sure that cargo test --all runs tests for all -# the crates. -[workspace] - [[bin]] name = "clif-util" path = "src/clif-util.rs" [dependencies] cfg-if = "0.1" -cranelift-codegen = { path = "cranelift-codegen", version = "0.59.0" } -cranelift-entity = { path = "cranelift-entity", version = "0.59.0" } -cranelift-reader = { path = "cranelift-reader", version = "0.59.0" } -cranelift-frontend = { path = "cranelift-frontend", version = "0.59.0" } -cranelift-serde = { path = "cranelift-serde", version = "0.59.0", optional = true } -cranelift-wasm = { path = "cranelift-wasm", version = "0.59.0", optional = true } -cranelift-native = { path = "cranelift-native", version = "0.59.0" } -cranelift-filetests = { path = "cranelift-filetests", version = "0.59.0" } -cranelift-module = { path = "cranelift-module", version = "0.59.0" } -cranelift-faerie = { path = "cranelift-faerie", version = "0.59.0" } -cranelift-object = { path = "cranelift-object", version = "0.59.0" } -cranelift-simplejit = { path = "cranelift-simplejit", version = "0.59.0" } -cranelift-preopt = { path = "cranelift-preopt", version = "0.59.0" } -cranelift = { path = "cranelift-umbrella", version = "0.59.0" } +cranelift-codegen = { path = "codegen", version = "0.59.0" } +cranelift-entity = { path = "entity", version = "0.59.0" } +cranelift-reader = { path = "reader", version = "0.59.0" } +cranelift-frontend = { path = "frontend", version = "0.59.0" } +cranelift-serde = { path = "serde", version = "0.59.0", optional = true } +cranelift-wasm = { path = "wasm", version = "0.59.0", optional = true } +cranelift-native = { path = "native", version = "0.59.0" } +cranelift-filetests = { path = "filetests", version = "0.59.0" } +cranelift-module = { path = "module", version = "0.59.0" } +cranelift-faerie = { path = "faerie", version = "0.59.0" } +cranelift-object = { path = "object", version = "0.59.0" } +cranelift-simplejit = { path = "simplejit", version = "0.59.0" } +cranelift-preopt = { path = "preopt", version = "0.59.0" } +cranelift = { path = "umbrella", version = "0.59.0" } filecheck = "0.4.0" clap = "2.32.0" serde = "1.0.8" diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml index 6c70e2e551..11ea1836d0 100644 --- a/cranelift/bforest/Cargo.toml +++ b/cranelift/bforest/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["btree", "forest", "set", "map"] edition = "2018" [dependencies] -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0", default-features = false } +cranelift-entity = { path = "../entity", version = "0.59.0", default-features = false } [badges] maintenance = { status = "experimental" } diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index 8a693994dd..ce8773b67c 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -14,8 +14,8 @@ edition = "2018" [dependencies] cranelift-codegen-shared = { path = "./shared", version = "0.59.0" } -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0" } -cranelift-bforest = { path = "../cranelift-bforest", version = "0.59.0" } +cranelift-entity = { path = "../entity", version = "0.59.0" } +cranelift-bforest = { path = "../bforest", version = "0.59.0" } hashbrown = { version = "0.6", optional = true } target-lexicon = "0.10" log = { version = "0.4.6", default-features = false } diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml index b26c12381a..cc60048144 100644 --- a/cranelift/codegen/meta/Cargo.toml +++ b/cranelift/codegen/meta/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] cranelift-codegen-shared = { path = "../shared", version = "0.59.0" } -cranelift-entity = { path = "../../cranelift-entity", version = "0.59.0" } +cranelift-entity = { path = "../../entity", version = "0.59.0" } [badges] maintenance = { status = "experimental" } diff --git a/cranelift/faerie/Cargo.toml b/cranelift/faerie/Cargo.toml index fcd67551fc..63d26264e3 100644 --- a/cranelift/faerie/Cargo.toml +++ b/cranelift/faerie/Cargo.toml @@ -10,14 +10,14 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-module = { path = "../cranelift-module", version = "0.59.0" } +cranelift-module = { path = "../module", version = "0.59.0" } faerie = "0.14.0" goblin = "0.1.0" anyhow = "1.0" target-lexicon = "0.10" [dependencies.cranelift-codegen] -path = "../cranelift-codegen" +path = "../codegen" version = "0.59.0" default-features = false features = ["std"] diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml index f773773c19..1ed5461341 100644 --- a/cranelift/filetests/Cargo.toml +++ b/cranelift/filetests/Cargo.toml @@ -10,10 +10,10 @@ publish = false edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", features = ["testing_hooks"] } -cranelift-native = { path = "../cranelift-native", version = "0.59.0" } -cranelift-reader = { path = "../cranelift-reader", version = "0.59.0" } -cranelift-preopt = { path = "../cranelift-preopt", version = "0.59.0" } +cranelift-codegen = { path = "../codegen", version = "0.59.0", features = ["testing_hooks"] } +cranelift-native = { path = "../native", version = "0.59.0" } +cranelift-reader = { path = "../reader", version = "0.59.0" } +cranelift-preopt = { path = "../preopt", version = "0.59.0" } file-per-thread-logger = "0.1.2" filecheck = "0.4.0" gimli = { version = "0.20.0", default-features = false, features = ["read"] } diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml index 39e0c5e594..0b6a0dc2b5 100644 --- a/cranelift/frontend/Cargo.toml +++ b/cranelift/frontend/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } target-lexicon = "0.10" log = { version = "0.4.6", default-features = false } hashbrown = { version = "0.6", optional = true } diff --git a/cranelift/fuzz/Cargo.toml b/cranelift/fuzz/Cargo.toml index d2dca75c64..948a07abc9 100644 --- a/cranelift/fuzz/Cargo.toml +++ b/cranelift/fuzz/Cargo.toml @@ -12,9 +12,9 @@ cargo-fuzz = true cargo-fuzz = "*" binaryen = { git = "https://github.com/pepyakin/binaryen-rs.git" } libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } -cranelift-codegen = { path = "../cranelift-codegen" } -cranelift-wasm = { path = "../cranelift-wasm" } -cranelift-reader = { path = "../cranelift-reader" } +cranelift-codegen = { path = "../codegen" } +cranelift-wasm = { path = "../wasm" } +cranelift-reader = { path = "../reader" } target-lexicon = "0.10" # Prevent this from interfering with workspaces diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml index 7ece676ca5..22f124b713 100644 --- a/cranelift/module/Cargo.toml +++ b/cranelift/module/Cargo.toml @@ -11,8 +11,8 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0" } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } +cranelift-entity = { path = "../entity", version = "0.59.0" } hashbrown = { version = "0.6", optional = true } log = { version = "0.4.6", default-features = false } thiserror = "1.0.4" diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml index 40c58922b6..ae571edffe 100644 --- a/cranelift/native/Cargo.toml +++ b/cranelift/native/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } target-lexicon = "0.10" [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml index 74007aab80..2ec0e3902c 100644 --- a/cranelift/object/Cargo.toml +++ b/cranelift/object/Cargo.toml @@ -10,13 +10,13 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-module = { path = "../cranelift-module", version = "0.59.0" } +cranelift-module = { path = "../module", version = "0.59.0" } object = { version = "0.17", default-features = false, features = ["write"] } target-lexicon = "0.10" goblin = "0.1.0" [dependencies.cranelift-codegen] -path = "../cranelift-codegen" +path = "../codegen" version = "0.59.0" default-features = false features = ["std"] diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml index dfee57b887..a62b990284 100644 --- a/cranelift/preopt/Cargo.toml +++ b/cranelift/preopt/Cargo.toml @@ -12,8 +12,8 @@ keywords = ["optimize", "compile", "compiler", "jit"] edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0" } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } +cranelift-entity = { path = "../entity", version = "0.59.0" } # This is commented out because it doesn't build on Rust 1.25.0, which # cranelift currently supports. # rustc_apfloat = { version = "0.1.2", default-features = false } diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml index 190ea86225..8ecda5e776 100644 --- a/cranelift/reader/Cargo.toml +++ b/cranelift/reader/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0" } +cranelift-codegen = { path = "../codegen", version = "0.59.0" } target-lexicon = "0.10" [badges] diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml index d3f091a0ef..6ab2ae0045 100644 --- a/cranelift/serde/Cargo.toml +++ b/cranelift/serde/Cargo.toml @@ -18,8 +18,8 @@ clap = "2.32.0" serde = "1.0.8" serde_derive = "1.0.75" serde_json = "1.0.26" -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0" } -cranelift-reader = { path = "../cranelift-reader", version = "0.59.0" } +cranelift-codegen = { path = "../codegen", version = "0.59.0" } +cranelift-reader = { path = "../reader", version = "0.59.0" } [badges] maintenance = { status = "experimental" } diff --git a/cranelift/simplejit/Cargo.toml b/cranelift/simplejit/Cargo.toml index 1e83e6c797..845551ff3a 100644 --- a/cranelift/simplejit/Cargo.toml +++ b/cranelift/simplejit/Cargo.toml @@ -10,8 +10,8 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-module = { path = "../cranelift-module", version = "0.59.0" } -cranelift-native = { path = "../cranelift-native", version = "0.59.0" } +cranelift-module = { path = "../module", version = "0.59.0" } +cranelift-native = { path = "../native", version = "0.59.0" } region = "2.0.0" libc = { version = "0.2.42" } errno = "0.2.4" @@ -19,7 +19,7 @@ target-lexicon = "0.10" memmap = { version = "0.7.0", optional = true } [dependencies.cranelift-codegen] -path = "../cranelift-codegen" +path = "../codegen" version = "0.59.0" default-features = false features = ["std"] @@ -32,9 +32,9 @@ selinux-fix = ['memmap'] default = [] [dev-dependencies] -cranelift = { path = "../cranelift-umbrella", version = "0.59.0" } -cranelift-frontend = { path = "../cranelift-frontend", version = "0.59.0" } -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0" } +cranelift = { path = "../umbrella", version = "0.59.0" } +cranelift-frontend = { path = "../frontend", version = "0.59.0" } +cranelift-entity = { path = "../entity", version = "0.59.0" } [badges] maintenance = { status = "experimental" } diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml index 98185b0c04..f3a1aa8976 100644 --- a/cranelift/umbrella/Cargo.toml +++ b/cranelift/umbrella/Cargo.toml @@ -12,8 +12,8 @@ keywords = ["compile", "compiler", "jit"] edition = "2018" [dependencies] -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } -cranelift-frontend = { path = "../cranelift-frontend", version = "0.59.0", default-features = false } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } +cranelift-frontend = { path = "../frontend", version = "0.59.0", default-features = false } [features] default = ["std"] diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml index 5f9dd30551..bc5bb83f7b 100644 --- a/cranelift/wasm/Cargo.toml +++ b/cranelift/wasm/Cargo.toml @@ -12,9 +12,9 @@ edition = "2018" [dependencies] wasmparser = { version = "0.51.0", default-features = false } -cranelift-codegen = { path = "../cranelift-codegen", version = "0.59.0", default-features = false } -cranelift-entity = { path = "../cranelift-entity", version = "0.59.0" } -cranelift-frontend = { path = "../cranelift-frontend", version = "0.59.0", default-features = false } +cranelift-codegen = { path = "../codegen", version = "0.59.0", default-features = false } +cranelift-entity = { path = "../entity", version = "0.59.0" } +cranelift-frontend = { path = "../frontend", version = "0.59.0", default-features = false } hashbrown = { version = "0.6", optional = true } log = { version = "0.4.6", default-features = false } serde = { version = "1.0.94", features = ["derive"], optional = true } diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index 66b2c38470..d90f9cd3cf 100644 --- a/crates/environ/Cargo.toml +++ b/crates/environ/Cargo.toml @@ -13,9 +13,9 @@ edition = "2018" [dependencies] anyhow = "1.0" -cranelift-codegen = { version = "0.59.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.59.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.59.0", features = ["enable-serde"] } +cranelift-codegen = { path = "../../cranelift/codegen", version = "0.59.0", features = ["enable-serde"] } +cranelift-entity = { path = "../../cranelift/entity", version = "0.59.0", features = ["enable-serde"] } +cranelift-wasm = { path = "../../cranelift/wasm", version = "0.59.0", features = ["enable-serde"] } wasmparser = "0.51.2" lightbeam = { path = "../lightbeam", optional = true, version = "0.12.0" } indexmap = "1.0.2" @@ -44,7 +44,7 @@ tempfile = "3" target-lexicon = { version = "0.10.0", default-features = false } pretty_env_logger = "0.3.0" rand = { version = "0.7.0", default-features = false, features = ["small_rng"] } -cranelift-codegen = { version = "0.59.0", features = ["enable-serde", "all-arch"] } +cranelift-codegen = { path = "../../cranelift/codegen", version = "0.59.0", features = ["enable-serde", "all-arch"] } filetime = "0.2.7" lazy_static = "1.3.0" diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index f7c50e66f2..83c2373de9 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -11,11 +11,11 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.59.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.59.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.59.0", features = ["enable-serde"] } -cranelift-native = "0.59.0" -cranelift-frontend = "0.59.0" +cranelift-codegen = { path = "../../cranelift/codegen", version = "0.59.0", features = ["enable-serde"] } +cranelift-entity = { path = "../../cranelift/entity", version = "0.59.0", features = ["enable-serde"] } +cranelift-wasm = { path = "../../cranelift/wasm", version = "0.59.0", features = ["enable-serde"] } +cranelift-native = { path = "../../cranelift/native", version = "0.59.0" } +cranelift-frontend = { path = "../../cranelift/frontend", version = "0.59.0" } wasmtime-environ = { path = "../environ", version = "0.12.0" } wasmtime-runtime = { path = "../runtime", version = "0.12.0" } wasmtime-debug = { path = "../debug", version = "0.12.0" } diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml index f51889b9b2..e6cc26c8a3 100644 --- a/crates/lightbeam/Cargo.toml +++ b/crates/lightbeam/Cargo.toml @@ -19,7 +19,7 @@ memoffset = "0.5.3" itertools = "0.8.2" capstone = "0.6.0" thiserror = "1.0.9" -cranelift-codegen = "0.59.0" +cranelift-codegen = { path = "../../cranelift/codegen", version = "0.59.0" } multi_mut = "0.1" either = "1.5" typemap = "0.3"