From 35b1125a933000c2aea8fdbbced360fccfa56c1b Mon Sep 17 00:00:00 2001 From: jaseb Date: Tue, 13 Feb 2024 19:35:28 +0800 Subject: [PATCH] Update dependencies --- Cargo.lock | 448 ++++++++++++++++++++++--------------------------- Cargo.toml | 28 ++-- README.md | 2 +- src/runtime.rs | 24 +-- 4 files changed, 227 insertions(+), 275 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0ca359..ef6d8bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.11" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -309,9 +309,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.13" +version = "4.5.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -319,9 +319,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", @@ -331,9 +331,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" @@ -408,18 +408,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "7c22542c0b95bd3302f7ed6839869c561f2324bac2fd5e7e99f5cfa65fdc8b92" +checksum = "7e7c0d51205b863591dd1e7aaa0fb69c2ea7bed48ffa63d6c4a848b07a35a732" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "6b3db903ef2e9c8a4de2ea6db5db052c7857282952f9df604aa55d169e6000d8" +checksum = "9ffb467cbc25543e4c20d2ad669bf8275598047b03c89652ad5fe2a0f47fc0e1" dependencies = [ "bumpalo", "cranelift-bforest", @@ -438,33 +438,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "6590feb5a1d6438f974bf6a5ac4dddf69fca14e1f07f3265d880f69e61a94463" +checksum = "bc7e74aed5c2b91e38d090653506afbd2cd3be1ff70593e2aa6bb82b3c6b77ff" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "7239038c56fafe77fddc8788fc8533dd6c474dc5bdc5637216404f41ba807330" +checksum = "9ff2dd24cce0775566da85770cb48aa58fef901cf2bff30275b42e7dbe62cbd5" [[package]] name = "cranelift-control" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f7dc9c595341404d381d27a3d950160856b35b402275f0c3990cd1ad683c8053" +checksum = "e8bcf4d5c73bbca309edf3af2839b5218e5c74cfbf22b0ac492af8a1d11120d9" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "44e3ee532fc4776c69bcedf7e62f9632cbb3f35776fa9a525cdade3195baa3f7" +checksum = "286754159b1a685475d6a0b4710832f950d6f4846a817002e2c23ff001321a65" dependencies = [ "serde", "serde_derive", @@ -472,9 +472,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a612c94d09e653662ec37681dc2d6fd2b9856e6df7147be0afc9aabb0abf19df" +checksum = "67150a1fef9857caba710f8c0c8223d640f02c0e5d1ebbfc75ed62912599cb6b" dependencies = [ "cranelift-codegen", "log", @@ -484,15 +484,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "85db9830abeb1170b7d29b536ffd55af1d4d26ac8a77570b5d1aca003bf225cc" +checksum = "eb7ceea70d3e0d7f69df7657f99de902e32016731c5a8d2788c1df0215f00952" [[package]] name = "cranelift-native" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "301ef0edafeaeda5771a5d2db64ac53e1818ae3111220a185677025fe91db4a1" +checksum = "707e5d9384ce4fa3c40af1abf4c3ec49857745cced5187593385f4a2c0b95445" dependencies = [ "cranelift-codegen", "libc", @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.103.0" +version = "0.104.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "380f0abe8264e4570ac615fc31cef32a3b90a77f7eb97b08331f9dd357b1f500" +checksum = "d4d957e3ff2a14c2f974a66c22bfcedcd2bd0272af8dce4236869c3942f5a471" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -511,7 +511,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", "wasmtime-types", ] @@ -567,9 +567,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.114" +version = "1.0.116" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "2ed3a27153f220bb42b96005947ca3b87266cfdae5b4b4d703642c3a565e9708" +checksum = "8aff472b83efd22bfc0176aa8ba34617dd5c17364670eb201a5f06d339b8abf7" dependencies = [ "cc", "cxxbridge-flags", @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.114" +version = "1.0.116" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "005721caedeb9869792e656d567695281c7e2bf2ac022d4ed95e5240b215f44d" +checksum = "bcf6e7a52c19013a9a0ec421c7d9c2d1125faf333551227e0a017288d71b47c3" dependencies = [ "cc", "codespan-reporting", @@ -594,15 +594,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.114" +version = "1.0.116" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "b6981d27196cca89f82c8a89fd495cca25066d2933c974e907f7c3699801e112" +checksum = "589e83d02fc1d4fb78f5ad56ca08835341e23499d086d2821315869426d618dc" [[package]] name = "cxxbridge-macro" -version = "1.0.114" +version = "1.0.116" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "ca7e7d41b675af76ee4844e8e4c1cec70b65555dbc4852eae7b11c9cd5525d60" +checksum = "e2cb1fd8ffae4230c7cfbbaf3698dbeaf750fa8c5dadf7ed897df581b9b572a5" dependencies = [ "proc-macro2", "quote", @@ -690,17 +690,27 @@ version = "0.1.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1062,17 +1072,6 @@ version = "2.9.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1715,9 +1714,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" @@ -1797,9 +1796,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -1841,9 +1840,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2024,8 +2023,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walrus" -version = "0.20.1" -source = "git+/~https://github.com/rustwasm/walrus?rev=db5d437b91e80c564f5e45204b8b165027d2a870#db5d437b91e80c564f5e45204b8b165027d2a870" +version = "0.20.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7" dependencies = [ "anyhow", "gimli 0.26.2", @@ -2040,12 +2040,13 @@ dependencies = [ [[package]] name = "walrus-macro" version = "0.19.0" -source = "git+/~https://github.com/rustwasm/walrus?rev=db5d437b91e80c564f5e45204b8b165027d2a870#db5d437b91e80c564f5e45204b8b165027d2a870" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn 2.0.48", + "syn 1.0.109", ] [[package]] @@ -2056,9 +2057,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "154528979a211aa28d969846e883df75705809ed9bcc70aba61460683ea7355b" +checksum = "025e842ba390587e523785ff58bd54fbbf1781b8d3072bc9aba4dc0b809f69da" dependencies = [ "anyhow", "async-trait", @@ -2074,14 +2075,14 @@ dependencies = [ "system-interface", "tracing", "wasi-common", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-common" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "3d888b611fee7d273dd057dc009d2dd3132736f36710ffd65657ac83628d1e3b" +checksum = "da4d4023cc65b3615590d38db0afb79234de09b3bb89cb0d8f83bdee9f5c28a8" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -2094,14 +2095,14 @@ dependencies = [ "tracing", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-tokio" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "dc11ea245d6e06291d6924dab5564ff55b1d4d1f553add8edf2489a9660f3af5" +checksum = "c97de58a5b89e9ab479a2f9e17e9eb41d0e0156e3c979b2e7f00e9499d2e97b7" dependencies = [ "anyhow", "cap-std", @@ -2117,17 +2118,17 @@ dependencies = [ [[package]] name = "wasi-virt" version = "0.1.0" -source = "git+/~https://github.com/bytecodealliance/WASI-Virt?rev=6801514735cb78b385221e225c554bc043038c2f#6801514735cb78b385221e225c554bc043038c2f" +source = "git+/~https://github.com/bytecodealliance/WASI-Virt?rev=b3a141a6423a994d1e7268103ddc54432a5e63dd#b3a141a6423a994d1e7268103ddc54432a5e63dd" dependencies = [ "anyhow", "clap", "serde", "toml 0.7.8", "walrus", - "wasm-compose 0.4.13", - "wasm-metadata 0.10.14 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasm-compose", + "wasm-metadata", "wasm-opt", - "wit-component 0.18.2", + "wit-component 0.19.1", ] [[package]] @@ -2186,29 +2187,9 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-compose" -version = "0.4.13" -source = "git+/~https://github.com/dicej/wasm-tools?branch=wasm-compose-resource-imports#2ad52c85247e81bc15ca2543bc248856bfa452a3" -dependencies = [ - "anyhow", - "heck 0.4.1", - "im-rc", - "indexmap 2.1.0", - "log", - "petgraph", - "serde", - "serde_derive", - "serde_yaml", - "smallvec", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", - "wat 1.0.79", -] - -[[package]] -name = "wasm-compose" -version = "0.4.16" +version = "0.5.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "3b94a79af7b8e7ec0e31edc75a5ed41600fc987371a840d5e69bbe4123625e15" +checksum = "fd324927af875ebedb1b820c00e3c585992d33c2c787c5021fe6d8982527359b" dependencies = [ "anyhow", "heck 0.4.1", @@ -2220,9 +2201,9 @@ dependencies = [ "serde_derive", "serde_yaml", "smallvec", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wat 1.0.82", + "wasm-encoder 0.41.2", + "wasmparser 0.121.2", + "wat", ] [[package]] @@ -2234,14 +2215,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-encoder" -version = "0.36.2" -source = "git+/~https://github.com/dicej/wasm-tools?branch=wasm-compose-resource-imports#2ad52c85247e81bc15ca2543bc248856bfa452a3" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.38.1" @@ -2253,32 +2226,28 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.38.1" -source = "git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d#3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" +version = "0.39.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "111495d6204760238512f57a9af162f45086504da332af210f2f75dd80b34f1d" dependencies = [ "leb128", ] [[package]] -name = "wasm-metadata" -version = "0.10.14" +name = "wasm-encoder" +version = "0.41.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d835d67708f6374937c550ad8dd1d17c616ae009e3f00d7a0ac9f7825e78c36a" +checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" dependencies = [ - "anyhow", - "indexmap 2.1.0", - "serde", - "serde_derive", - "serde_json", - "spdx", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "leb128", + "wasmparser 0.121.2", ] [[package]] name = "wasm-metadata" -version = "0.10.14" -source = "git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d#3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" +version = "0.10.20" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "18ebaa7bd0f9e7a5e5dd29b9a998acf21c4abed74265524dd7e85934597bfb10" dependencies = [ "anyhow", "indexmap 2.1.0", @@ -2286,8 +2255,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.38.1 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", - "wasmparser 0.118.1 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", + "wasm-encoder 0.41.2", + "wasmparser 0.121.2", ] [[package]] @@ -2338,28 +2307,30 @@ checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "wasmparser" -version = "0.116.1" -source = "git+/~https://github.com/dicej/wasm-tools?branch=wasm-compose-resource-imports#2ad52c85247e81bc15ca2543bc248856bfa452a3" +version = "0.118.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ - "hashbrown 0.14.3", "indexmap 2.1.0", "semver", ] [[package]] name = "wasmparser" -version = "0.118.1" +version = "0.119.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" +checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" dependencies = [ + "bitflags 2.4.1", "indexmap 2.1.0", "semver", ] [[package]] name = "wasmparser" -version = "0.118.1" -source = "git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d#3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" +version = "0.121.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.4.1", "indexmap 2.1.0", @@ -2373,14 +2344,14 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ "anyhow", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a8e539fded2495422ea3c4dfa7beeddba45904eece182cf315294009e1a323bf" +checksum = "8acb6aa966be38f613954c3debe7ba6c7a02ffd0537432be438da0b038955cdf" dependencies = [ "anyhow", "async-trait", @@ -2400,8 +2371,8 @@ dependencies = [ "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -2411,24 +2382,24 @@ dependencies = [ "wasmtime-jit", "wasmtime-runtime", "wasmtime-winch", - "wat 1.0.82", - "windows-sys 0.48.0", + "wat", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "660ba9143e15a2acd921820df221b73aee256bd3ca2d208d73d8adc9587ccbb9" +checksum = "c1495ef4d46aec14f967b672e946e391dd8a14a443cda3d5e0779ff67fb6e28d" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a3ce373743892002f9391c6741ef0cb0335b55ec899d874f311222b7e36f4594" +checksum = "e2de1b065bdbaca3df9e7e9f70eb129e326a99d971b16d666acd798d98d47635" dependencies = [ "anyhow", "base64", @@ -2440,15 +2411,15 @@ dependencies = [ "serde_derive", "sha2", "toml 0.5.11", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "12ef32643324e564e1c359e9044daa06cbf90d7e2d6c99a738d17a12959f01a5" +checksum = "2f19bcff82f81ba0273c0b68f3909977b0dd54489bc86c630d8aad43dca92f3f" dependencies = [ "anyhow", "proc-macro2", @@ -2456,20 +2427,20 @@ dependencies = [ "syn 2.0.48", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.13.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wit-parser 0.13.2", ] [[package]] name = "wasmtime-component-util" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8c87d06c18d21a4818f354c00a85f4ebc62b2270961cd022968452b0e4dbed9d" +checksum = "8af072b7ad5ac5583e1f9e4737ebf88923de564fb5d4ace0ca9b4b720bdf95a1" [[package]] name = "wasmtime-cranelift" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "2d648c8b4064a7911093b02237cd5569f71ca171d3a0a486bf80600b19e1cba2" +checksum = "df08a8bd9a68732577bee05ac685e4c247238b5e79ad9c062e2dfb4d04dca132" dependencies = [ "anyhow", "cfg-if", @@ -2484,7 +2455,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -2492,9 +2463,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "290a89027688782da8ff60b12bb95695494b1874e0d0ba2ba387d23dace6d70c" +checksum = "404201c9e669083f189f01337b3ed0aa0eb081157fb4e170bbfe193df9497771" dependencies = [ "anyhow", "cranelift-codegen", @@ -2508,9 +2479,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "61eb64fb3e0da883e2df4a13a81d6282e072336e6cb6295021d0f7ab2e352754" +checksum = "7e696b4911c9a69c3c2892ec05eb41bb15436d1a46d8830a755c40f5df47546a" dependencies = [ "anyhow", "cranelift-entity", @@ -2522,8 +2493,8 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -2531,9 +2502,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "40ecf1d3a838b0956b71ad3f8cb80069a228339775bf02dd35d86a5a68bbe443" +checksum = "4a39681c1f6f54d1bf7efe5dc829f8d7fc0e2ca12c346fd7a3efbf726e9681d2" dependencies = [ "anyhow", "cc", @@ -2541,14 +2512,14 @@ dependencies = [ "rustix", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f485336add49267d8859e8f8084d2d4b9a4b1564496b6f30ba5b168d50c10ceb" +checksum = "2c56519882d936c680bd191d58ac04cff071a470eca2dcc664adcd60f986a731" dependencies = [ "addr2line", "anyhow", @@ -2568,14 +2539,14 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-debug" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "65e119affec40edb2fab9044f188759a00c2df9c3017278d047012a2de1efb4f" +checksum = "babc65e64ab0dd4e1ce65624db64e24ed0fbdebb16148729173fa0da9f70e53c" dependencies = [ "object", "once_cell", @@ -2585,20 +2556,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "6b6d197fcc34ad32ed440e1f9552fd57d1f377d9699d31dee1b5b457322c1f8a" +checksum = "d7ec5b11c12d9acb09612e7ce04c4c8aea3e8dc79b2591ffdead986a5ce8ec49" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "794b2bb19b99ef8322ff0dd9fe1ba7e19c41036dfb260b3f99ecce128c42ff92" +checksum = "28e1c31bbdf67cb86f149bcead5193749f23f77c93c5244ec9ac8d192f90966c" dependencies = [ "anyhow", "cc", @@ -2614,34 +2585,34 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasm-encoder 0.38.1", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-types" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d995db8bb56f2cd8d2dc0ed5ffab94ffb435283b0fe6747f80f7aab40b2d06a1" +checksum = "52e799cff634d30fd042db96b417d515e54f903b95f8c1e0ec60e8f604479485" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f55c5565959287c21dd0f4277ae3518dd2ae62679f655ee2dbc4396e19d210db" +checksum = "e10fe166d4e4c95d5d80c5b47e1e12256af2099ac525ddb9a19b1aeb8896e5e1" dependencies = [ "proc-macro2", "quote", @@ -2650,9 +2621,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "ccd8370078149d49a3a47e93741553fd79b700421464b6a27ca32718192ab130" +checksum = "494f99111a165dcddc69aaa5fa23604f49dcfab479a869edd84581abd6ac569b" dependencies = [ "anyhow", "async-trait", @@ -2681,21 +2652,21 @@ dependencies = [ "wasi-tokio", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-winch" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "2c6f945ff9bad96e0a69973d74f193c19f627c8adbf250e7cb73ae7564b6cc8a" +checksum = "d3f5d76d399cb4423e6f178bc154a0e1c314711e28dabaa6e757e56628a083ec" dependencies = [ "anyhow", "cranelift-codegen", "gimli 0.28.1", "object", "target-lexicon", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -2703,21 +2674,21 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f328b2d4a690270324756e886ed5be3a4da4c00be0eea48253f4595ad068062b" +checksum = "6bb3bc92c031cf4961135bffe055a69c1bd67c253dca20631478189bb05ec27b" dependencies = [ "anyhow", "heck 0.4.1", "indexmap 2.1.0", - "wit-parser 0.13.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wit-parser 0.13.2", ] [[package]] name = "wasmtime-wmemcheck" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "67761d8f8c0b3c13a5d34356274b10a40baba67fe9cfabbfc379a8b414e45de2" +checksum = "5da08ab734954e16f57be38423b90c25a0b13420e51cbd0a2e37b86a468a988c" [[package]] name = "wast" @@ -2730,42 +2701,24 @@ dependencies = [ [[package]] name = "wast" -version = "67.0.1" -source = "git+/~https://github.com/dicej/wasm-tools?branch=wasm-compose-resource-imports#2ad52c85247e81bc15ca2543bc248856bfa452a3" -dependencies = [ - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.36.2", -] - -[[package]] -name = "wast" -version = "69.0.1" +version = "71.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" +checksum = "647c3ac4354da32688537e8fc4d2fe6c578df51896298cb64727d98088a1fd26" dependencies = [ + "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wat" -version = "1.0.79" -source = "git+/~https://github.com/dicej/wasm-tools?branch=wasm-compose-resource-imports#2ad52c85247e81bc15ca2543bc248856bfa452a3" -dependencies = [ - "wast 67.0.1", + "wasm-encoder 0.41.2", ] [[package]] name = "wat" -version = "1.0.82" +version = "1.0.88" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" +checksum = "b69c36f634411568a2c6d24828b674961e37ea03340fe1d605c337ed8162d901" dependencies = [ - "wast 69.0.1", + "wast 71.0.1", ] [[package]] @@ -2785,18 +2738,18 @@ dependencies = [ "rustyline", "tokio", "wasi-virt", - "wasm-compose 0.4.16", + "wasm-compose", "wasmtime", "wasmtime-wasi", - "wit-component 0.19.0", - "wit-parser 0.13.0 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", + "wit-component 0.21.0", + "wit-parser 0.14.0", ] [[package]] name = "wiggle" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "0afb26cd3269289bb314a361ff0a6685e5ce793b62181a9fe3f81ace15051697" +checksum = "cd5b200b5dd3d5d7cc4093166f4f916d2d2839296cf1b1757b9726635f6425c3" dependencies = [ "anyhow", "async-trait", @@ -2809,9 +2762,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "cef2868fed7584d2b552fa317104858ded80021d23b073b2d682d3c932a027bd" +checksum = "a4dc34a2bc1091599de005e9b854cd1a9ea35b16ca51cac2797274c1a2666e06" dependencies = [ "anyhow", "heck 0.4.1", @@ -2824,9 +2777,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "16.0.0" +version = "17.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "31ae1ec11a17ea481539ee9a5719a278c9790d974060fbf71db4b2c05378780b" +checksum = "37ba3b37f402a7513b9ed7973a6e907074987b3afdcede98d3d79939b3e76f1b" dependencies = [ "proc-macro2", "quote", @@ -2867,9 +2820,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.14.0" +version = "0.15.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "58e58c236a6abdd9ab454552b4f29e16cfa837a86897c1503313b2e62e7609ec" +checksum = "8d921185084e134e897e0e202e129a422306d0f1391954ecf4928d36defa897d" dependencies = [ "anyhow", "cranelift-codegen", @@ -2877,7 +2830,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.118.1", "wasmtime-environ", ] @@ -3024,9 +2977,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.32" +version = "0.5.40" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -3043,9 +2996,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.18.2" +version = "0.19.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "5b8a35a2a9992898c9d27f1664001860595a4bc99d32dd3599d547412e17d7e2" +checksum = "429e3c06fba3a7566aab724ae3ffff3152ede5399d44789e7dd11f5421292859" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -3054,16 +3007,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.38.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasm-metadata 0.10.14 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.118.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "wit-parser 0.13.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "wasm-encoder 0.39.0", + "wasm-metadata", + "wasmparser 0.119.0", + "wit-parser 0.13.2", ] [[package]] name = "wit-component" -version = "0.19.0" -source = "git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d#3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" +version = "0.21.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "be60cd1b2ff7919305301d0c27528d4867bd793afe890ba3837743da9655d91b" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -3072,17 +3026,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.38.1 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", - "wasm-metadata 0.10.14 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", - "wasmparser 0.118.1 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", - "wit-parser 0.13.0 (git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d)", + "wasm-encoder 0.41.2", + "wasm-metadata", + "wasmparser 0.121.2", + "wit-parser 0.14.0", ] [[package]] name = "wit-parser" -version = "0.13.0" +version = "0.13.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "15df6b7b28ce94b8be39d8df5cb21a08a4f3b9f33b631aedb4aa5776f785ead3" +checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", @@ -3097,8 +3051,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.13.0" -source = "git+/~https://github.com/bytecodealliance/wasm-tools?rev=3c4f2f38211b42b8e5fcf1732c7f5f147e59854d#3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" +version = "0.14.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +checksum = "1ee4ad7310367bf272507c0c8e0c74a80b4ed586b833f7c7ca0b7588f686f11a" dependencies = [ "anyhow", "id-arena", @@ -3109,6 +3064,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", + "wasmparser 0.121.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a392d75..d0bc0fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,25 +9,21 @@ repository = "/~https://github.com/rylev/wepl" [dependencies] anyhow = "1.0" -async-trait = "0.1.73" -clap = { version = "4.4.2", features = ["derive"] } -bytes = "1.0" -env_logger = "0.10" -home = "0.5.5" +async-trait = "0.1.77" +clap = { version = "4.5.0", features = ["derive"] } +bytes = "1.5.0" +env_logger = "0.11" +home = "0.5.9" log = "0.4" nom = "7.1.3" nom_locate = "4.2" rustyline = "13.0.0" colored = "2" -tokio = { version = "1.0", features = ["macros"] } +tokio = { version = "1.36.0", features = ["macros"] } -wasmtime = { version = "16.0", features = [ - "component-model", -] } -wasmtime-wasi = { version = "16.0", features = [ - "tokio", -] } -wasi-virt = { git = "/~https://github.com/bytecodealliance/WASI-Virt", rev = "6801514735cb78b385221e225c554bc043038c2f" } -wit-component = { git = "/~https://github.com/bytecodealliance/wasm-tools", rev = "3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" } -wit-parser = { git = "/~https://github.com/bytecodealliance/wasm-tools", rev = "3c4f2f38211b42b8e5fcf1732c7f5f147e59854d" } -wasm-compose = "0.4.2" +wasmtime = { version = "17.0.1", features = [ "component-model", ] } +wasmtime-wasi = { version = "17.0.1", features = [ "tokio", ] } +wasi-virt = { git = "/~https://github.com/bytecodealliance/WASI-Virt", rev = "b3a141a6423a994d1e7268103ddc54432a5e63dd" } +wit-component = "0.21.0" +wit-parser = "0.14.0" +wasm-compose = "0.5.5" diff --git a/README.md b/README.md index 602c004..0eb538f 100644 --- a/README.md +++ b/README.md @@ -39,4 +39,4 @@ Supported functions include: ## Compatibility -`wepl` is currently tied to the wasmtime 16 release. Components that work with that release should work in `wepl`. +`wepl` is currently tied to the wasmtime 17 release. Components that work with that release should work in `wepl`. diff --git a/src/runtime.rs b/src/runtime.rs index 38db3da..75dcb39 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -6,11 +6,11 @@ use std::{ use anyhow::Context as _; use colored::Colorize; use wasmtime::{ - component::{Component, Func, Instance, Linker, Val}, + component::{Component, Func, Instance, Linker, ResourceTable, Val}, Config, Engine, Store, }; use wasmtime_wasi::preview2::{ - HostOutputStream, Stdout, StdoutStream, StreamResult, Subscribe, Table, WasiCtx, + HostOutputStream, Stdout, StdoutStream, StreamResult, Subscribe, WasiCtx, WasiCtxBuilder, WasiView, }; @@ -358,7 +358,7 @@ struct ImportImpls { impl ImportImpls { fn new(engine: &Engine, prefix: String) -> Self { - let table = Table::new(); + let table = ResourceTable::new(); let mut builder = WasiCtxBuilder::new(); builder.inherit_stderr(); builder.stdout(ImportImplStdout::new(prefix)); @@ -428,7 +428,7 @@ impl StdoutStream for ImportImplStdout { } fn build_store(engine: &Engine) -> Store { - let table = Table::new(); + let table = ResourceTable::new(); let mut builder = WasiCtxBuilder::new(); builder.inherit_stdout().inherit_stderr(); let wasi = builder.build(); @@ -437,22 +437,22 @@ fn build_store(engine: &Engine) -> Store { } pub struct Context { - table: Table, + table: ResourceTable, wasi: WasiCtx, } impl Context { - fn new(table: Table, wasi: WasiCtx) -> Self { + fn new(table: ResourceTable, wasi: WasiCtx) -> Self { Self { table, wasi } } } impl WasiView for Context { - fn table(&self) -> &Table { + fn table(&self) -> &ResourceTable { &self.table } - fn table_mut(&mut self) -> &mut Table { + fn table_mut(&mut self) -> &mut ResourceTable { &mut self.table } @@ -477,22 +477,22 @@ fn load_component(engine: &Engine, component_bytes: &[u8]) -> anyhow::Result Self { + fn new(table: ResourceTable, wasi: WasiCtx) -> Self { Self { table, wasi } } } impl WasiView for ImportImplsContext { - fn table(&self) -> &Table { + fn table(&self) -> &ResourceTable { &self.table } - fn table_mut(&mut self) -> &mut Table { + fn table_mut(&mut self) -> &mut ResourceTable { &mut self.table }