Use crates.io releases of Cranelift

I originally switched the Cranelift dependencies to use git as cg_clif
required a lot of new Cranelift features. With crates.io dependencies I
would have to wait for a new release every time. With git dependencies I
could start using the new features as soon as they were merged.
Currently there aren't a lot of new Cranelift features necessary anymore
and those that are useful are no longer blocking compilation of lots of
crates. There was some concern expressed about using git dependencies in
the main rust repo, so all together I think it is best to switch to
crates.io releases and if necessary wait a bit before merging changes
requiring newer Cranelift commits.
This commit is contained in:
bjorn3 2021-10-29 16:22:45 +02:00
parent 7ee78417d0
commit 977e884acf
2 changed files with 36 additions and 26 deletions

50
Cargo.lock generated
View File

@ -33,16 +33,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "cranelift-bforest" name = "cranelift-bforest"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513"
dependencies = [ dependencies = [
"cranelift-entity", "cranelift-entity",
] ]
[[package]] [[package]]
name = "cranelift-codegen" name = "cranelift-codegen"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c"
dependencies = [ dependencies = [
"cranelift-bforest", "cranelift-bforest",
"cranelift-codegen-meta", "cranelift-codegen-meta",
@ -57,8 +59,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-codegen-meta" name = "cranelift-codegen-meta"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf"
dependencies = [ dependencies = [
"cranelift-codegen-shared", "cranelift-codegen-shared",
"cranelift-entity", "cranelift-entity",
@ -66,18 +69,21 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-codegen-shared" name = "cranelift-codegen-shared"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be"
[[package]] [[package]]
name = "cranelift-entity" name = "cranelift-entity"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a"
[[package]] [[package]]
name = "cranelift-frontend" name = "cranelift-frontend"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"log", "log",
@ -87,8 +93,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-jit" name = "cranelift-jit"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e8f0d60fb5d67f7a1e5c49db38ba96d1c846921faef02085fc5590b74781747"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cranelift-codegen", "cranelift-codegen",
@ -104,8 +111,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-module" name = "cranelift-module"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "825ac7e0959cbe7ddc9cc21209f0319e611a57f9fcb2b723861fe7ef2017e651"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cranelift-codegen", "cranelift-codegen",
@ -115,8 +123,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-native" name = "cranelift-native"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"libc", "libc",
@ -125,8 +134,9 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-object" name = "cranelift-object"
version = "0.77.0" version = "0.78.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#e04357505eb05760f2ea94cebeef6e8370cd9458" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55500d0fc9bb05c0944fc4506649249d28f55bd4fe95b87f0e55bf41058f0e6d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cranelift-codegen", "cranelift-codegen",

View File

@ -8,12 +8,12 @@ crate-type = ["dylib"]
[dependencies] [dependencies]
# These have to be in sync with each other # These have to be in sync with each other
cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", features = ["unwind", "all-arch"] } cranelift-codegen = { version = "0.78.0", features = ["unwind", "all-arch"] }
cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git" } cranelift-frontend = "0.78.0"
cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git" } cranelift-module = "0.78.0"
cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git" } cranelift-native = "0.78.0"
cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", optional = true } cranelift-jit = { version = "0.78.0", optional = true }
cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git" } cranelift-object = "0.78.0"
target-lexicon = "0.12.0" target-lexicon = "0.12.0"
gimli = { version = "0.25.0", default-features = false, features = ["write"]} gimli = { version = "0.25.0", default-features = false, features = ["write"]}
object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] } object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }