traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade wasmtime

Browse source
This commit is contained in:
Max Brunsfeld 2024-03-20 18:23:37 -07:00
parent 8945e3a111
commit b7fcf9878e
3 changed files with 65 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

138
Cargo.lock generated
View file

@ -122,7 +122,7 @@ dependencies = [
"bitflags 2.4.2",
"cexpr",
"clang-sys",
"itertools 0.12.1",
"itertools",
"lazy_static",
"lazycell",
"log",
@ -288,18 +288,18 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "cranelift-bforest"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16d5521e2abca66bbb1ddeecbb6f6965c79160352ae1579b39f8c86183895c24"
checksum = "6a535eb1cf5a6003197dc569320c40c1cb2d2f97ef5d5348eebf067f20957381"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef40a4338a47506e832ac3e53f7f1375bc59351f049a8379ff736dd02565bd95"
checksum = "11b5066db32cec1492573827183af2142d2d88fe85a83cfc9e73f0f63d3788d4"
dependencies = [
"bumpalo",
"cranelift-bforest",
@ -318,33 +318,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d24cd5d85985c070f73dfca07521d09086362d1590105ba44b0932bf33513b61"
checksum = "64942e5774308e835fbad4dd25f253105412c90324631910e1ec27963147bddb"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0584c4363e3aa0a3c7cb98a778fbd5326a3709f117849a727da081d4051726c"
checksum = "c39c33db9a86dd6d8d04166a10c53deb477aeea3500eaaefca682e4eda9bb986"
[[package]]
name = "cranelift-control"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f25ecede098c6553fdba362a8e4c9ecb8d40138363bff47f9712db75be7f0571"
checksum = "4b7fc4937613aea3156a0538800a17bf56f345a5da2e79ae3df58488c93d867f"
dependencies = [
"arbitrary",
]
[[package]]
name = "cranelift-entity"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea081a42f25dc4c5b248b87efdd87dcd3842a1050a37524ec5391e6172058cb"
checksum = "f85575e79a153ce1ddbfb7fe1813519b4bfe1eb200cc9c8353b45ad123ae4d36"
dependencies = [
"serde",
"serde_derive",
@ -352,9 +352,9 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9796e712f5af797e247784f7518e6b0a83a8907d73d51526982d86ecb3a58b68"
checksum = "bbc31d6c0ab2249fe0c21e988256b42f5f401ab2673b4fc40076c82a698bdfb9"
dependencies = [
"cranelift-codegen",
"log",
@ -364,15 +364,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4a66ccad5782f15c80e9dd5af0df4acfe6e3eee98e8f7354a2e5c8ec3104bdd"
checksum = "dc14f37e3314c0e4c53779c2f46753bf242efff76ee9473757a1fff3b495ad37"
[[package]]
name = "cranelift-native"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "285e80df1d9b79ded9775b285df68b920a277b84f88a7228d2f5bc31fcdc58eb"
checksum = "2ea5375f76ab31f9800a23fb2b440810286a6f669a3eb467cdd7ff255ea64268"
dependencies = [
"cranelift-codegen",
"libc",
@ -381,17 +381,17 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
version = "0.105.3"
version = "0.106.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4135b0ab01fd16aa8f8821196e9e2fe15953552ccaef8ba5153be0ced04ef757"
checksum = "79851dba01b1fa83fad95134aa27beca88dc4b027121d92ab19788582389dc5f"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
"itertools 0.10.5",
"itertools",
"log",
"smallvec",
"wasmparser 0.121.2",
"wasmparser",
"wasmtime-types",
]
@ -640,15 +640,6 @@ version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
[[package]]
name = "itertools"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.12.1"
@ -1374,7 +1365,6 @@ dependencies = [
"bindgen",
"cc",
"regex",
"wasmtime",
"wasmtime-c-api-impl",
]
@ -1419,7 +1409,7 @@ dependencies = [
"tree-sitter-tests-proc-macro",
"unindent",
"walkdir",
"wasmparser 0.201.0",
"wasmparser",
"webbrowser",
]
@ -1616,24 +1606,13 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "wasm-encoder"
version = "0.41.2"
version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae"
checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
dependencies = [
"leb128",
]
[[package]]
name = "wasmparser"
version = "0.121.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
dependencies = [
"bitflags 2.4.2",
"indexmap",
"semver",
]
[[package]]
name = "wasmparser"
version = "0.201.0"
@ -1647,9 +1626,9 @@ dependencies = [
[[package]]
name = "wasmtime"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8106d7d22d63d1bcb940e22dcc7b03e46f0fc8bfbaf2fd7b6cb8f448f9449774"
checksum = "6a08af88fa3d324cc5cf6d388d90ef396a787b3fb4bbd51ba185f8645dc0f02c"
dependencies = [
"anyhow",
"bincode",
@ -1667,28 +1646,29 @@ dependencies = [
"serde_derive",
"serde_json",
"target-lexicon",
"wasmparser 0.121.2",
"wasmparser",
"wasmtime-cranelift",
"wasmtime-environ",
"wasmtime-jit-icache-coherence",
"wasmtime-runtime",
"wasmtime-slab",
"windows-sys 0.52.0",
]
[[package]]
name = "wasmtime-asm-macros"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b0cf02cea951ace34ee3b0e64b7f446c3519d1c95ad75bc5330f405e275ee8f"
checksum = "16cdbfcf28542bcda0b5fd68d44603e53e5ad126cbe7b9f25c130e1249fd8211"
dependencies = [
"cfg-if",
]
[[package]]
name = "wasmtime-c-api-impl"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f96047f874d27fabf09349b6c97b08e51a88fe24de099f43ade7d1e4d0831e"
checksum = "67dea28073e105735210b9e932b5e654198d5e28ed31f1314037cd7664ceda2b"
dependencies = [
"anyhow",
"log",
@ -1700,9 +1680,9 @@ dependencies = [
[[package]]
name = "wasmtime-c-api-macros"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9549e63f745b6d53d087662d30f813d588b8fcb11d3a456ab7b9375361284c0"
checksum = "0cfe12050fa28b17ab8434ab757fee281dd0d5c7715fa1bc5e4c0b29d1705415"
dependencies = [
"proc-macro2",
"quote",
@ -1710,9 +1690,9 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "595abdb067acdc812ab0f21d8d46d5aa4022392aa7c3e0632c20bff9ec49ffb4"
checksum = "67ea025c969a09117818732fa6f96848e858a7953d4659dab8081a6eea3c0523"
dependencies = [
"anyhow",
"cfg-if",
@ -1727,7 +1707,7 @@ dependencies = [
"object",
"target-lexicon",
"thiserror",
"wasmparser 0.121.2",
"wasmparser",
"wasmtime-cranelift-shared",
"wasmtime-environ",
"wasmtime-versioned-export-macros",
@ -1735,9 +1715,9 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift-shared"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8c24c1fdea167b992d82ebe76471fd1cbe7b0b406bc72f9250f86353000134e"
checksum = "dcd6dd2f8d8d4860b384f61f89b597633a5b5f0943c546210e5084c5d321fe20"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -1751,9 +1731,9 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3279d510005358141550d8a90a5fc989d7e81748e5759d582fe6bfdcbf074a04"
checksum = "7f60f3f717658dd77745de03b750d5852126e9be6dad465848c77f90387c44c9"
dependencies = [
"anyhow",
"bincode",
@ -1766,15 +1746,15 @@ dependencies = [
"serde_derive",
"target-lexicon",
"thiserror",
"wasmparser 0.121.2",
"wasmparser",
"wasmtime-types",
]
[[package]]
name = "wasmtime-jit-icache-coherence"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "866634605089b4632b32226b54aa3670d72e1849f9fc425c7e50b3749c2e6df3"
checksum = "2796e4b4989db62899d2117e1e0258b839d088c044591b14e3a0396e7b3ae53a"
dependencies = [
"cfg-if",
"libc",
@ -1783,9 +1763,9 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e11185c88cadf595d228f5ae4ff9b4badbf9ca98dcb37b0310c36e31fa74867f"
checksum = "4bf2b7745df452a4f41b9aab21d3f7ba1347b12da2fdc5241e59306127884a68"
dependencies = [
"anyhow",
"cc",
@ -1809,23 +1789,29 @@ dependencies = [
]
[[package]]
name = "wasmtime-types"
version = "18.0.3"
name = "wasmtime-slab"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f32377cbd827bee06fcb2f6bf97b0477fdcc86888bbe6db7b9cab8e644082e0a"
checksum = "83448ef600ad95977019ebaea84a5516fdbc9561d0a8e26b1e099351f993b527"
[[package]]
name = "wasmtime-types"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf6fe7ed3fd18ed4b1e4465fe5c8674acc9f03523fca5b1b9f975b2560cd741b"
dependencies = [
"cranelift-entity",
"serde",
"serde_derive",
"thiserror",
"wasmparser 0.121.2",
"wasmparser",
]
[[package]]
name = "wasmtime-versioned-export-macros"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab8d7566d206c42f8cf1d4ac90c5e40d3582e8eabad9b3b67e9e73c61fc47a1"
checksum = "6d6d967f01032da7d4c6303da32f6a00d5efe1bac124b156e7342d8ace6ffdfc"
dependencies = [
"proc-macro2",
"quote",
@ -1834,9 +1820,9 @@ dependencies = [
[[package]]
name = "wasmtime-wmemcheck"
version = "18.0.3"
version = "19.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3847d969bd203b8cd239f89581e52432a0f00b8c5c9bc917be2fccd7542c4f2f"
checksum = "36bd91a4dc55af0bf55e9e2ab0ea13724cfb5c5a1acdf8873039769208f59490"
[[package]]
name = "web-sys"

10
lib/Cargo.toml
View file

@ -26,19 +26,13 @@ include = [
]
[features]
wasm = ["wasmtime", "wasmtime-c-api"]
wasm = ["wasmtime-c-api"]
[dependencies]
regex.workspace = true
[dependencies.wasmtime]
version = "18.0.1"
optional = true
default-features = false
features = ["cranelift"]
[dependencies.wasmtime-c-api]
version = "18.0.1"
version = "19"
optional = true
package = "wasmtime-c-api-impl"
default-features = false

2
lib/binding_rust/wasm_language.rs
View file

@ -6,7 +6,7 @@ use std::{
mem::{self, MaybeUninit},
os::raw::c_char,
};
pub use wasmtime;
pub use wasmtime_c_api::wasmtime;
// Force Cargo to include wasmtime-c-api as a dependency of this crate,
// even though it is only used by the C code.