Commit d82eec0c authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1744677 - Remove Cargo.toml patch for wasmtime crates. r=rhunt 

Apart from Cargo.toml being garbled by cargo on publication, what's
vendored is exactly the same as on crates.io, so we don't need to use a
patch to pull from git anymore.

Differential Revision: https://phabricator.services.mozilla.com/D133040
parent 1674b860

.cargo/config.in

+0 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ git = "https://github.com/gfx-rs/naga" 
replace-with = "vendored-sources"

rev = "29571cc"



[source."https://github.com/bytecodealliance/wasmtime"]

git = "https://github.com/bytecodealliance/wasmtime"

replace-with = "vendored-sources"

rev = "824fa69756523f2b6d49029fe25de94130b1f144"



[source.crates-io]

replace-with = "vendored-sources"

Cargo.lock

+14 −7
Original line number Diff line number Diff line
@@ -811,7 +811,8 @@ dependencies = [ 
[[package]]

name = "cranelift-bforest"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"

dependencies = [

 "cranelift-entity",

]
@@ -819,7 +820,8 @@ dependencies = [ 
[[package]]

name = "cranelift-codegen"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276"

dependencies = [

 "cranelift-bforest",

 "cranelift-codegen-meta",
@@ -834,7 +836,8 @@ dependencies = [ 
[[package]]

name = "cranelift-codegen-meta"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821"

dependencies = [

 "cranelift-codegen-shared",

 "cranelift-entity",
@@ -843,17 +846,20 @@ dependencies = [ 
[[package]]

name = "cranelift-codegen-shared"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b"



[[package]]

name = "cranelift-entity"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c"



[[package]]

name = "cranelift-frontend"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"

dependencies = [

 "cranelift-codegen",

 "log",
@@ -864,7 +870,8 @@ dependencies = [ 
[[package]]

name = "cranelift-wasm"

version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89"

dependencies = [

 "cranelift-codegen",

 "cranelift-entity",

Cargo.toml

+0 −8
Original line number Diff line number Diff line
@@ -90,14 +90,6 @@ slotmap = { git = "https://github.com/kvark/dummy-web" } 
wasm-bindgen = { git = "https://github.com/kvark/dummy-web" }

web-sys = { git = "https://github.com/kvark/dummy-web" }



[patch.crates-io.cranelift-codegen]

git = "https://github.com/bytecodealliance/wasmtime"

rev = "824fa69756523f2b6d49029fe25de94130b1f144"



[patch.crates-io.cranelift-wasm]

git = "https://github.com/bytecodealliance/wasmtime"

rev = "824fa69756523f2b6d49029fe25de94130b1f144"



# Patch autocfg to hide rustc output. Workaround for https://github.com/cuviper/autocfg/issues/30

[patch.crates-io.autocfg]

path = "third_party/rust/autocfg"

js/src/wasm/cranelift/Cargo.toml

+0 −4
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ crate-type = ["rlib"] 
name = "baldrdash"



[dependencies]

# The build system redirects the versions of cranelift-codegen and

# cranelift-wasm to pinned commits. If you want to update Cranelift in Gecko,

# you should update the following $TOP_LEVEL/Cargo.toml file: look for the

# revision (rev) hashes of both cranelift dependencies (codegen and wasm).

cranelift-codegen = { version = "0.74.0", default-features = false }

cranelift-wasm = { version = "0.74.0" }

log = { version = "0.4.6", default-features = false, features = ["release_max_level_info"] }

third_party/rust/cranelift-bforest/.cargo-checksum.json

+1 −1
Original line number Diff line number Diff line 
{"files":{"Cargo.toml":"a7d80142a69961977d90a5e39a78ed0820d093698c8a591559e8150d8b39ac73","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"af367c67340fa7f6fb9a35b0aa637dcf303957f7ae7427a5f4f6356801c8bb04","src/lib.rs":"4204f6bd3dd43dc307a57dc1b3543fc3d31feb4c5c8e64035578a45d88c725b3","src/map.rs":"a3b7f64cae7ec9c2a8038def315bcf90e8751552b1bc1c20b62fbb8c763866c4","src/node.rs":"28f7edd979f7b9712bc4ab30b0d2a1b8ad5485a4b1e8c09f3dcaf501b9b5ccd1","src/path.rs":"a86ee1c882c173e8af96fd53a416a0fb485dd3f045ac590ef313a9d9ecf90f56","src/pool.rs":"f6337b5417f7772e6878a160c1a40629199ff09997bdff18eb2a0ba770158600","src/set.rs":"281eb8b5ead1ffd395946464d881f9bb0e7fb61092aed701d72d2314b5f80994"},"package":null}
 
 No newline at end of file
 
{"files":{"Cargo.toml":"b55cb0207ff3ab216faf7e4fc2be10f5ebd3bc0dcff40c9c887d921aade169cf","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"af367c67340fa7f6fb9a35b0aa637dcf303957f7ae7427a5f4f6356801c8bb04","src/lib.rs":"4204f6bd3dd43dc307a57dc1b3543fc3d31feb4c5c8e64035578a45d88c725b3","src/map.rs":"a3b7f64cae7ec9c2a8038def315bcf90e8751552b1bc1c20b62fbb8c763866c4","src/node.rs":"28f7edd979f7b9712bc4ab30b0d2a1b8ad5485a4b1e8c09f3dcaf501b9b5ccd1","src/path.rs":"a86ee1c882c173e8af96fd53a416a0fb485dd3f045ac590ef313a9d9ecf90f56","src/pool.rs":"f6337b5417f7772e6878a160c1a40629199ff09997bdff18eb2a0ba770158600","src/set.rs":"281eb8b5ead1ffd395946464d881f9bb0e7fb61092aed701d72d2314b5f80994"},"package":"c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"}
 
 No newline at end of file