diff --git a/Cargo.lock b/Cargo.lock index d74e2e5..cce8149 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -80,7 +80,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.1", "rustc-demangle", ] @@ -207,9 +207,9 @@ name = "claw-ast" version = "0.2.5" dependencies = [ "claw-common", - "cranelift-entity", + "cranelift-entity 0.105.3", "miette", - "wit-parser 0.201.0", + "wit-parser 0.207.0", ] [[package]] @@ -222,16 +222,16 @@ dependencies = [ "claw-common", "claw-parser", "claw-resolver", - "cranelift-entity", + "cranelift-entity 0.105.3", "logos", "miette", "pretty_assertions", "thiserror", - "wasm-encoder 0.201.0", - "wasmprinter", + "wasm-encoder 0.207.0", + "wasmprinter 0.207.0", "wasmtime", "wat", - "wit-parser 0.201.0", + "wit-parser 0.207.0", ] [[package]] @@ -240,10 +240,10 @@ version = "0.2.5" dependencies = [ "claw-ast", "claw-resolver", - "cranelift-entity", + "cranelift-entity 0.105.3", "miette", "thiserror", - "wasm-encoder 0.201.0", + "wasm-encoder 0.207.0", "wat", ] @@ -261,7 +261,7 @@ version = "0.2.5" dependencies = [ "claw-ast", "claw-common", - "cranelift-entity", + "cranelift-entity 0.105.3", "logos", "miette", "pretty_assertions", @@ -274,10 +274,10 @@ version = "0.2.5" dependencies = [ "claw-ast", "claw-common", - "cranelift-entity", + "cranelift-entity 0.105.3", "miette", "thiserror", - "wit-parser 0.201.0", + "wit-parser 0.207.0", ] [[package]] @@ -288,16 +288,16 @@ dependencies = [ "claw-common", "claw-parser", "claw-resolver", - "wasmprinter", + "wasmprinter 0.207.0", "wasmtime", - "wit-parser 0.201.0", + "wit-parser 0.207.0", ] [[package]] name = "cpp_demangle" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if", ] @@ -313,25 +313,25 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d5521e2abca66bbb1ddeecbb6f6965c79160352ae1579b39f8c86183895c24" +checksum = "ebf72ceaf38f7d41194d0cf6748214d8ef7389167fe09aad80f87646dbfa325b" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.107.2", ] [[package]] name = "cranelift-codegen" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef40a4338a47506e832ac3e53f7f1375bc59351f049a8379ff736dd02565bd95" +checksum = "9ee7fde5cd9173f00ce02c491ee9e306d64740f4b1a697946e0474f389999e13" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.107.2", "cranelift-isle", "gimli", "hashbrown 0.14.3", @@ -343,24 +343,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24cd5d85985c070f73dfca07521d09086362d1590105ba44b0932bf33513b61" +checksum = "b49bec6a517e78d4067500dc16acb558e772491a2bcb37301127448adfb8413c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0584c4363e3aa0a3c7cb98a778fbd5326a3709f117849a727da081d4051726c" +checksum = "ead4ea497b2dc2ac31fcabd6d5d0d5dc25b3964814122e343724bdf65a53c843" [[package]] name = "cranelift-control" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25ecede098c6553fdba362a8e4c9ecb8d40138363bff47f9712db75be7f0571" +checksum = "f81e8028c8d711ea7592648e70221f2e54acb8665f7ecd49545f021ec14c3341" dependencies = [ "arbitrary", ] @@ -370,6 +370,12 @@ name = "cranelift-entity" version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea081a42f25dc4c5b248b87efdd87dcd3842a1050a37524ec5391e6172058cb" + +[[package]] +name = "cranelift-entity" +version = "0.107.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32acd0632ba65c2566e75f64af9ef094bb8d90e58a9fbd33d920977a9d85c054" dependencies = [ "serde", "serde_derive", @@ -377,9 +383,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9796e712f5af797e247784f7518e6b0a83a8907d73d51526982d86ecb3a58b68" +checksum = "a395a704934aa944ba8939cac9001174b9ae5236f48bc091f89e33bb968336f6" dependencies = [ "cranelift-codegen", "log", @@ -389,15 +395,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a66ccad5782f15c80e9dd5af0df4acfe6e3eee98e8f7354a2e5c8ec3104bdd" +checksum = "b325ce81c4ee7082dc894537eb342c37898e14230fe7c02ea945691db3e2dd01" [[package]] name = "cranelift-native" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285e80df1d9b79ded9775b285df68b920a277b84f88a7228d2f5bc31fcdc58eb" +checksum = "ea11f5ac85996fa093075d66397922d4f56085d5d84ec13043d0cd4f159c6818" dependencies = [ "cranelift-codegen", "libc", @@ -406,17 +412,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.105.3" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4135b0ab01fd16aa8f8821196e9e2fe15953552ccaef8ba5153be0ced04ef757" +checksum = "e4f175d4e299a8edabfbd64fa93c7650836cc8ad7f4879f9bd2632575a1f12d0" dependencies = [ "cranelift-codegen", - "cranelift-entity", + "cranelift-entity 0.107.2", "cranelift-frontend", "itertools", "log", "smallvec", - "wasmparser 0.121.2", + "wasmparser 0.202.0", "wasmtime-types", ] @@ -689,9 +695,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -739,9 +745,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libredox" @@ -799,10 +805,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -875,6 +881,15 @@ name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" dependencies = [ "crc32fast", "hashbrown 0.14.3", @@ -1046,9 +1061,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.4.1", "errno", @@ -1106,6 +1121,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "sha2" version = "0.10.8" @@ -1198,9 +1222,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "termcolor" @@ -1254,11 +1278,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ + "indexmap 2.1.0", "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -1311,27 +1360,27 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-encoder" -version = "0.41.2" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" +checksum = "bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a" dependencies = [ "leb128", ] [[package]] name = "wasm-encoder" -version = "0.201.0" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a" +checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17" dependencies = [ "leb128", ] [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" dependencies = [ "bitflags 2.4.1", "indexmap 2.1.0", @@ -1340,30 +1389,42 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.201.0" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" +checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" dependencies = [ + "ahash", "bitflags 2.4.1", + "hashbrown 0.14.3", "indexmap 2.1.0", "semver", ] [[package]] name = "wasmprinter" -version = "0.2.80" +version = "0.202.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab1cc9508685eef9502e787f4d4123745f5651a1e29aec047645d3cac1e2da7a" +dependencies = [ + "anyhow", + "wasmparser 0.202.0", +] + +[[package]] +name = "wasmprinter" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" +checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" dependencies = [ "anyhow", - "wasmparser 0.121.2", + "wasmparser 0.207.0", ] [[package]] name = "wasmtime" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8106d7d22d63d1bcb940e22dcc7b03e46f0fc8bfbaf2fd7b6cb8f448f9449774" +checksum = "4af5cb32045daee8476711eb12b8b71275c2dd1fc7a58cc2a11b33ce9205f6a2" dependencies = [ "addr2line", "anyhow", @@ -1378,17 +1439,18 @@ dependencies = [ "ittapi", "libc", "log", - "object", + "object 0.33.0", "once_cell", "paste", "rayon", "rustix", + "semver", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.41.2", - "wasmparser 0.121.2", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -1398,6 +1460,7 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", + "wasmtime-slab", "wasmtime-winch", "wat", "windows-sys 0.52.0", @@ -1405,18 +1468,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0cf02cea951ace34ee3b0e64b7f446c3519d1c95ad75bc5330f405e275ee8f" +checksum = "7515c4d24c8b55c0feab67e3d52a42f999fda8b9cfafbd69a82ed6bcf299d26e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3249204a71d728d53fb3eea18afd0473f87e520445707a4d567ac4da0bb3eb5d" +checksum = "c3aa2de7189ea6b3270727d0027790494aec5e7101ca50da3f9549a86628cae4" dependencies = [ "anyhow", "base64", @@ -1434,9 +1497,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3786c0531565ec6c9852c0e46299f06cb6e4b58d36e30f3c234cfa69bde376" +checksum = "794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3" dependencies = [ "anyhow", "proc-macro2", @@ -1444,87 +1507,70 @@ dependencies = [ "syn 2.0.49", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.13.2", + "wit-parser 0.202.0", ] [[package]] name = "wasmtime-component-util" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81eae2ec98027ee0b3950da83bc320120a23087ac4d39b3d59201cb5ebf52777" +checksum = "7839a1b9e15d17be1cb2a105f18be8e0bbf52bdec7a7cd6eb5d80d4c2cdf74f0" [[package]] name = "wasmtime-cranelift" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595abdb067acdc812ab0f21d8d46d5aa4022392aa7c3e0632c20bff9ec49ffb4" +checksum = "57ec2d9a4b9990bea53a5dfd689d48663dbd19a46903eaf73e2022b3d1ef20d3" dependencies = [ "anyhow", "cfg-if", "cranelift-codegen", "cranelift-control", - "cranelift-entity", + "cranelift-entity 0.107.2", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", "log", - "object", + "object 0.33.0", "target-lexicon", "thiserror", - "wasmparser 0.121.2", - "wasmtime-cranelift-shared", + "wasmparser 0.202.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] -[[package]] -name = "wasmtime-cranelift-shared" -version = "18.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c24c1fdea167b992d82ebe76471fd1cbe7b0b406bc72f9250f86353000134e" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli", - "object", - "target-lexicon", - "wasmtime-environ", -] - [[package]] name = "wasmtime-environ" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3279d510005358141550d8a90a5fc989d7e81748e5759d582fe6bfdcbf074a04" +checksum = "ad72e2e3f7ea5b50fedf66dd36ba24634e4f445c370644683b433d45d88f6126" dependencies = [ "anyhow", "bincode", "cpp_demangle", - "cranelift-entity", + "cranelift-entity 0.107.2", "gimli", "indexmap 2.1.0", "log", - "object", + "object 0.33.0", "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.41.2", - "wasmparser 0.121.2", - "wasmprinter", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", + "wasmprinter 0.202.0", "wasmtime-component-util", "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1df665f2117741d1265f5663b0d93068b18120c2c4b18b9faed49d00d92c31" +checksum = "4dbdf3053e7e7ced0cd4ed76579995b62169a1a43696890584eae2de2e33bf54" dependencies = [ "anyhow", "cc", @@ -1537,11 +1583,11 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f307739370736e5b0cd2b45910ff96bcda6d5d68b2c4384bcedb0af4f3b321" +checksum = "983ca409f2cd66385ce49486c022da0128acb7910c055beb5230998b49c6084c" dependencies = [ - "object", + "object 0.33.0", "once_cell", "rustix", "wasmtime-versioned-export-macros", @@ -1549,9 +1595,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866634605089b4632b32226b54aa3670d72e1849f9fc425c7e50b3749c2e6df3" +checksum = "ede45379f3b4d395d8947006de8043801806099a240a26db553919b68e96ab15" dependencies = [ "cfg-if", "libc", @@ -1560,9 +1606,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11185c88cadf595d228f5ae4ff9b4badbf9ca98dcb37b0310c36e31fa74867f" +checksum = "65019d29d175c567b84173f2adf3b7a3af6d5592f8fe510dccae55d2569ec0d2" dependencies = [ "anyhow", "cc", @@ -1571,41 +1617,47 @@ dependencies = [ "indexmap 2.1.0", "libc", "log", - "mach", + "mach2", "memfd", "memoffset", "paste", "psm", "rustix", "sptr", - "wasm-encoder 0.41.2", + "wasm-encoder 0.202.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", + "wasmtime-slab", "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-slab" +version = "20.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6585868f5c427c3e9d2a8c0c3354e6d7d4518a0d17723ab25a0c1eebf5d5b4" + [[package]] name = "wasmtime-types" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32377cbd827bee06fcb2f6bf97b0477fdcc86888bbe6db7b9cab8e644082e0a" +checksum = "84d5381ff174faded38c7b2085fbe430dff59489c87a91403354d710075750fb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.107.2", "serde", "serde_derive", "thiserror", - "wasmparser 0.121.2", + "wasmparser 0.202.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab8d7566d206c42f8cf1d4ac90c5e40d3582e8eabad9b3b67e9e73c61fc47a1" +checksum = "0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac" dependencies = [ "proc-macro2", "quote", @@ -1614,57 +1666,51 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a97bfccc241d1769cef75eb16f472a893982704d5f3c9c71c431c1484344a" +checksum = "996360967b5196dec20ddcfce499ce4dc80cc925c088b0f2b376d29b96833a6a" dependencies = [ "anyhow", "cranelift-codegen", "gimli", - "object", + "object 0.33.0", "target-lexicon", - "wasmparser 0.121.2", - "wasmtime-cranelift-shared", + "wasmparser 0.202.0", + "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", ] [[package]] name = "wasmtime-wit-bindgen" -version = "18.0.3" +version = "20.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2c76781a27e07802669f6f0e11eb4441546407eb65be60c3d862200988b92" +checksum = "01840c0cfbbb01664c796e3f4edbd656e58f9d76db083c7e7c6bba59ea657a96" dependencies = [ "anyhow", "heck", "indexmap 2.1.0", - "wit-parser 0.13.2", + "wit-parser 0.202.0", ] -[[package]] -name = "wasmtime-wmemcheck" -version = "18.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3847d969bd203b8cd239f89581e52432a0f00b8c5c9bc917be2fccd7542c4f2f" - [[package]] name = "wast" -version = "201.0.0" +version = "207.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef6e1ef34d7da3e2b374fd2b1a9c0227aff6cad596e1b24df9b58d0f6222faa" +checksum = "0e40be9fd494bfa501309487d2dc0b3f229be6842464ecbdc54eac2679c84c93" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.201.0", + "wasm-encoder 0.207.0", ] [[package]] name = "wat" -version = "1.201.0" +version = "1.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453d5b37a45b98dee4f4cb68015fc73634d7883bbef1c65e6e9c78d454cf3f32" +checksum = "8eb2b15e2d5f300f5e1209e7dc237f2549edbd4203655b6c6cab5cf180561ee7" dependencies = [ "wast", ] @@ -1702,9 +1748,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0bd4d6cac8d69525d475d0ce1e0801eb6f314d42e764a52bd497ed3cb9c371" +checksum = "cefeb84a0f39227cf2eb665cf348e6150ebf3372d08adff03264064ab590fdf4" dependencies = [ "anyhow", "cranelift-codegen", @@ -1712,7 +1758,8 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.121.2", + "wasmparser 0.202.0", + "wasmtime-cranelift", "wasmtime-environ", ] @@ -1848,11 +1895,20 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] + [[package]] name = "wit-parser" -version = "0.13.2" +version = "0.202.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" +checksum = "744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc" dependencies = [ "anyhow", "id-arena", @@ -1863,13 +1919,14 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", + "wasmparser 0.202.0", ] [[package]] name = "wit-parser" -version = "0.201.0" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6" +checksum = "78c83dab33a9618d86cfe3563cc864deffd08c17efc5db31a3b7cd1edeffe6e1" dependencies = [ "anyhow", "id-arena", @@ -1880,7 +1937,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.201.0", + "wasmparser 0.207.0", ] [[package]] @@ -1891,18 +1948,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.30" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.30" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", @@ -1911,28 +1968,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 8f572ea..48ee27f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,10 +62,10 @@ clap = { version = "3.0.0-rc.7", features = ["derive"] } thiserror = "1.0.30" miette = { version = "7.1.0", features = ["fancy"] } logos = "0.13.0" -wasm-encoder = "0.201" +wasm-encoder = "0.207" cranelift-entity = "0.105.3" -wat = "1.201.0" +wat = "1.207" pretty_assertions = "1.1.0" -wasmtime = "18" -wasmprinter = "0.2.75" -wit-parser = "0.201.0" +wasmtime = "20" +wasmprinter = "0.207" +wit-parser = "0.207" diff --git a/crates/codegen/src/builders/module.rs b/crates/codegen/src/builders/module.rs index d7d469f..ebe0b1b 100644 --- a/crates/codegen/src/builders/module.rs +++ b/crates/codegen/src/builders/module.rs @@ -65,6 +65,7 @@ impl ModuleBuilder { maximum: None, memory64: false, shared: false, + page_size_log2: None, }; let mem_ty = enc::EntityType::Memory(mem_type); self.imports.import(module, field, mem_ty); @@ -108,6 +109,7 @@ impl ModuleBuilder { ) -> ModuleGlobalIndex { let global_type = enc::GlobalType { mutable, + shared: false, val_type: valtype, }; self.globals.global(global_type, init_expr); diff --git a/crates/codegen/src/types.rs b/crates/codegen/src/types.rs index 8562e7d..71f4611 100644 --- a/crates/codegen/src/types.rs +++ b/crates/codegen/src/types.rs @@ -324,8 +324,8 @@ pub fn ptype_to_pvaltype(ptype: ast::PrimitiveType) -> enc::PrimitiveValType { PType::S32 => enc::PrimitiveValType::S32, PType::S16 => enc::PrimitiveValType::S16, PType::S8 => enc::PrimitiveValType::S8, - PType::F32 => enc::PrimitiveValType::Float32, - PType::F64 => enc::PrimitiveValType::Float64, + PType::F32 => enc::PrimitiveValType::F32, + PType::F64 => enc::PrimitiveValType::F64, PType::Bool => enc::PrimitiveValType::Bool, PType::String => enc::PrimitiveValType::String, } diff --git a/crates/resolver/src/imports.rs b/crates/resolver/src/imports.rs index 3f61f89..e1d2a12 100644 --- a/crates/resolver/src/imports.rs +++ b/crates/resolver/src/imports.rs @@ -236,8 +236,8 @@ impl<'ctx> InterfaceResolver<'ctx> { wit::Type::S16 => ResolvedType::Primitive(PType::S16), wit::Type::S32 => ResolvedType::Primitive(PType::S32), wit::Type::S64 => ResolvedType::Primitive(PType::S64), - wit::Type::Float32 => ResolvedType::Primitive(PType::F32), - wit::Type::Float64 => ResolvedType::Primitive(PType::F64), + wit::Type::F32 => ResolvedType::Primitive(PType::F32), + wit::Type::F64 => ResolvedType::Primitive(PType::F64), wit::Type::Char => todo!(), wit::Type::String => ResolvedType::Primitive(PType::String), wit::Type::Id(id) => {