github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update wasm-tools dependencies (#8478) 

Bumping to latest, which has `no_std` support for wasmparser, which will
be used in a future PR.
pull/8480/head
Alex Crichton 7 months ago
committed by GitHub
parent
60539520df
commit
79885bd8ed
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
7 changed files with 149 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 134
      Cargo.lock
  2. 18
      Cargo.toml
  3. 1
      cranelift/wasm/src/sections_translator.rs
  4. 4
      crates/environ/src/component/types.rs
  5. 1
      crates/environ/src/module_environ.rs
  6. 2
      supply-chain/config.toml
  7. 67
      supply-chain/imports.lock

134
Cargo.lock
View File

@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
version = "0.8.7"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
@ -606,7 +606,7 @@ dependencies = [
"cranelift-isle",
"criterion",
"gimli",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"log",
"postcard",
"regalloc2",
@ -679,7 +679,7 @@ name = "cranelift-frontend"
version = "0.108.0"
dependencies = [
"cranelift-codegen",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"log",
"similar",
"smallvec",
@ -749,7 +749,7 @@ dependencies = [
"anyhow",
"cranelift-codegen",
"cranelift-control",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"serde",
"serde_derive",
]
@ -839,14 +839,14 @@ dependencies = [
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"itertools 0.12.1",
"log",
"serde",
"serde_derive",
"smallvec",
"target-lexicon",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime-types",
"wat",
]
@ -1393,9 +1393,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.14.0"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [
"ahash",
]
@ -1552,7 +1552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"serde",
]
@ -1926,7 +1926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d"
dependencies = [
"crc32fast",
"hashbrown 0.14.0",
"hashbrown 0.14.3",
"indexmap 2.0.0",
"memchr",
]
@ -2770,7 +2770,7 @@ dependencies = [
"cargo_metadata",
"heck",
"wasmtime",
"wit-component 0.205.0",
"wit-component 0.206.0",
]
[[package]]
@ -3106,7 +3106,7 @@ name = "verify-component-adapter"
version = "21.0.0"
dependencies = [
"anyhow",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wat",
]
@ -3198,7 +3198,7 @@ dependencies = [
"byte-array-literals",
"object 0.33.0",
"wasi",
"wasm-encoder 0.205.0",
"wasm-encoder 0.206.0",
"wit-bindgen",
]
@ -3267,9 +3267,9 @@ dependencies = [
[[package]]
name = "wasm-encoder"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90e95b3563d164f33c1cfb0a7efbd5940c37710019be10cd09f800fdec8b0e5c"
checksum = "d759312e1137f199096d80a70be685899cd7d3d09c572836bb2e9b69b4dc3b1e"
dependencies = [
"leb128",
]
@ -3292,9 +3292,9 @@ dependencies = [
[[package]]
name = "wasm-metadata"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9855ad6dd4d099fa8505f01fb0b84c7e3efd5f555207329e3ad938d5f394fe7"
checksum = "84435ac34e29de6154fdb180ebbe2bdde96336f7ad0990003c43a21bd441303f"
dependencies = [
"anyhow",
"indexmap 2.0.0",
@ -3302,36 +3302,36 @@ dependencies = [
"serde_derive",
"serde_json",
"spdx",
"wasm-encoder 0.205.0",
"wasmparser 0.205.0",
"wasm-encoder 0.206.0",
"wasmparser 0.206.0",
]
[[package]]
name = "wasm-mutate"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d92842509e0cc163a0f8f4a54e38ec180e18594b9ed3999d0a05108e70d25cb3"
checksum = "afd8f7a4dc2b33e16b5fe96e31922ab3d5351abd93e404fcdc5bdd67d91915f0"
dependencies = [
"egg",
"log",
"rand",
"thiserror",
"wasm-encoder 0.205.0",
"wasmparser 0.205.0",
"wasm-encoder 0.206.0",
"wasmparser 0.206.0",
]
[[package]]
name = "wasm-smith"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1218f393276f7a13f6c54467434633144b46c33ecbc3cbafdc938033f0315d1a"
checksum = "797d1293e8c8ce440c22dc283b7db0f68035929928f1736f12f4d9bf8fd2a24d"
dependencies = [
"anyhow",
"arbitrary",
"flagset",
"indexmap 2.0.0",
"leb128",
"wasm-encoder 0.205.0",
"wasm-encoder 0.206.0",
]
[[package]]
@ -3387,11 +3387,13 @@ dependencies = [
[[package]]
name = "wasmparser"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d457bb52804242e09d55a306e53ddbc65d1d29ed83db6a4eea3ed412ee0cfdf"
checksum = "39192edb55d55b41963db40fd49b0b542156f04447b5b512744a91d38567bdbc"
dependencies = [
"ahash",
"bitflags 2.4.1",
"hashbrown 0.14.3",
"indexmap 2.0.0",
"semver",
]
@ -3407,12 +3409,12 @@ dependencies = [
[[package]]
name = "wasmprinter"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edcd1e00bc348d4b1c0abe913d86f4a89377cbd5c1c704d4eca5cf3492a27da8"
checksum = "3dec456f9cc479792c9920055cd499ae1d13f85e98f9443dfe4ea5751b21f3b0"
dependencies = [
"anyhow",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
]
[[package]]
@ -3444,8 +3446,8 @@ dependencies = [
"target-lexicon",
"tempfile",
"wasi-common",
"wasm-encoder 0.205.0",
"wasmparser 0.205.0",
"wasm-encoder 0.206.0",
"wasmparser 0.206.0",
"wasmtime-cache",
"wasmtime-component-macro",
"wasmtime-component-util",
@ -3585,7 +3587,7 @@ dependencies = [
"tracing",
"walkdir",
"wasi-common",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime",
"wasmtime-cache",
"wasmtime-cli-flags",
@ -3599,10 +3601,10 @@ dependencies = [
"wasmtime-wasi-nn",
"wasmtime-wasi-threads",
"wasmtime-wast",
"wast 205.0.0",
"wast 206.0.0",
"wat",
"windows-sys 0.52.0",
"wit-component 0.205.0",
"wit-component 0.206.0",
]
[[package]]
@ -3633,7 +3635,7 @@ dependencies = [
"wasmtime",
"wasmtime-component-util",
"wasmtime-wit-bindgen",
"wit-parser 0.205.0",
"wit-parser 0.206.0",
]
[[package]]
@ -3657,7 +3659,7 @@ dependencies = [
"object 0.33.0",
"target-lexicon",
"thiserror",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime-environ",
"wasmtime-versioned-export-macros",
]
@ -3681,8 +3683,8 @@ dependencies = [
"serde_derive",
"target-lexicon",
"thiserror",
"wasm-encoder 0.205.0",
"wasmparser 0.205.0",
"wasm-encoder 0.206.0",
"wasmparser 0.206.0",
"wasmprinter",
"wasmtime-component-util",
"wasmtime-types",
@ -3697,7 +3699,7 @@ dependencies = [
"component-fuzz-util",
"env_logger",
"libfuzzer-sys",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmprinter",
"wasmtime-environ",
"wat",
@ -3754,7 +3756,7 @@ dependencies = [
"rand",
"smallvec",
"target-lexicon",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime",
"wasmtime-fuzzing",
]
@ -3775,12 +3777,12 @@ dependencies = [
"target-lexicon",
"tempfile",
"v8",
"wasm-encoder 0.205.0",
"wasm-encoder 0.206.0",
"wasm-mutate",
"wasm-smith",
"wasm-spec-interpreter",
"wasmi",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmprinter",
"wasmtime",
"wasmtime-wast",
@ -3828,7 +3830,7 @@ dependencies = [
"rustix",
"smallvec",
"sptr",
"wasm-encoder 0.205.0",
"wasm-encoder 0.206.0",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-fiber",
@ -3852,7 +3854,7 @@ dependencies = [
"serde_derive",
"smallvec",
"thiserror",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
]
[[package]]
@ -3959,7 +3961,7 @@ dependencies = [
"anyhow",
"log",
"wasmtime",
"wast 205.0.0",
"wast 206.0.0",
]
[[package]]
@ -3971,7 +3973,7 @@ dependencies = [
"gimli",
"object 0.33.0",
"target-lexicon",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime-cranelift",
"wasmtime-environ",
"winch-codegen",
@ -3984,7 +3986,7 @@ dependencies = [
"anyhow",
"heck",
"indexmap 2.0.0",
"wit-parser 0.205.0",
"wit-parser 0.206.0",
]
[[package]]
@ -4002,24 +4004,24 @@ dependencies = [
[[package]]
name = "wast"
version = "205.0.0"
version = "206.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "441a6a195b3b5245e26d450bbcc91366c6b652382a22f63cbe3c73240e13b2bb"
checksum = "68586953ee4960b1f5d84ebf26df3b628b17e6173bc088e0acfbce431469795a"
dependencies = [
"bumpalo",
"leb128",
"memchr",
"unicode-width",
"wasm-encoder 0.205.0",
"wasm-encoder 0.206.0",
]
[[package]]
name = "wat"
version = "1.205.0"
version = "1.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19832624d606e7c6bf3cd4caa73578ecec5eac30c768269256d19c79900beb18"
checksum = "da4c6f2606276c6e991aebf441b2fc92c517807393f039992a3e0ad873efe4ad"
dependencies = [
"wast 205.0.0",
"wast 206.0.0",
]
[[package]]
@ -4149,7 +4151,7 @@ dependencies = [
"regalloc2",
"smallvec",
"target-lexicon",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
"wasmtime-cranelift",
"wasmtime-environ",
]
@ -4400,9 +4402,9 @@ dependencies = [
[[package]]
name = "wit-component"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74841e17b2c2bfbd8ca8c45190ef85dff1c5e8659f0e2d164802ffc87dfb18c3"
checksum = "81e1ae4cace3706e29a8cf1f728b792255ecdc02653b9f4130ab6cc64f435a67"
dependencies = [
"anyhow",
"bitflags 2.4.1",
@ -4411,10 +4413,10 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
"wasm-encoder 0.205.0",
"wasm-metadata 0.205.0",
"wasmparser 0.205.0",
"wit-parser 0.205.0",
"wasm-encoder 0.206.0",
"wasm-metadata 0.206.0",
"wasmparser 0.206.0",
"wit-parser 0.206.0",
]
[[package]]
@ -4437,9 +4439,9 @@ dependencies = [
[[package]]
name = "wit-parser"
version = "0.205.0"
version = "0.206.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3db34c7688c161ed7bd1b2f8055dca9fb2c15201db58754e9c48a0805f32e5f"
checksum = "d226de4e95e052cb664d2bdad2f31d9cad5117038a3439568f078d1afd8842fe"
dependencies = [
"anyhow",
"id-arena",
@ -4450,7 +4452,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser 0.205.0",
"wasmparser 0.206.0",
]
[[package]]

18
Cargo.toml
View File

@ -234,15 +234,15 @@ rustix = "0.38.31"
wit-bindgen = { version = "0.22.0", default-features = false }
# wasm-tools family:
wasmparser = "0.205.0"
wat = "1.205.0"
wast = "205.0.0"
wasmprinter = "0.205.0"
wasm-encoder = "0.205.0"
wasm-smith = "0.205.0"
wasm-mutate = "0.205.0"
wit-parser = "0.205.0"
wit-component = "0.205.0"
wasmparser = "0.206.0"
wat = "1.206.0"
wast = "206.0.0"
wasmprinter = "0.206.0"
wasm-encoder = "0.206.0"
wasm-smith = "0.206.0"
wasm-mutate = "0.206.0"
wit-parser = "0.206.0"
wit-component = "0.206.0"
# Non-Bytecode Alliance maintained dependencies:
# --------------------------

1
cranelift/wasm/src/sections_translator.rs
View File

@ -381,6 +381,7 @@ pub fn parse_name_section<'data>(
| wasmparser::Name::Element(_)
| wasmparser::Name::Data(_)
| wasmparser::Name::Tag(_)
| wasmparser::Name::Field(_)
| wasmparser::Name::Unknown { .. } => {}
}
}

4
crates/environ/src/component/types.rs
View File

@ -831,7 +831,7 @@ impl ComponentTypesBuilder {
self.add_tuple_type(TypeTuple { types, abi })
}
fn flags_type(&mut self, flags: &IndexSet<KebabString>) -> TypeFlagsIndex {
fn flags_type(&mut self, flags: &wasmparser::map::IndexSet<KebabString>) -> TypeFlagsIndex {
let flags = TypeFlags {
names: flags.iter().map(|s| s.to_string()).collect(),
abi: CanonicalAbiInfo::flags(flags.len()),
@ -839,7 +839,7 @@ impl ComponentTypesBuilder {
self.add_flags_type(flags)
}
fn enum_type(&mut self, variants: &IndexSet<KebabString>) -> TypeEnumIndex {
fn enum_type(&mut self, variants: &wasmparser::map::IndexSet<KebabString>) -> TypeEnumIndex {
let names = variants
.iter()
.map(|s| s.to_string())

1
crates/environ/src/module_environ.rs
View File

@ -876,6 +876,7 @@ and for re-adding support for interface types you can see this issue:
| wasmparser::Name::Element(_)
| wasmparser::Name::Data(_)
| wasmparser::Name::Tag(_)
| wasmparser::Name::Field(_)
| wasmparser::Name::Unknown { .. } => {}
}
}

2
supply-chain/config.toml
View File

@ -189,7 +189,7 @@ version = "0.17.0"
criteria = "safe-to-deploy"
[[exemptions.ahash]]
version = "0.7.6"
version = "0.8.11"
criteria = "safe-to-deploy"
[[exemptions.bincode]]

67
supply-chain/imports.lock
View File

@ -826,6 +826,13 @@ user-id = 2915
user-login = "Amanieu"
user-name = "Amanieu d'Antras"
[[publisher.hashbrown]]
version = "0.14.3"
when = "2023-11-26"
user-id = 2915
user-login = "Amanieu"
user-name = "Amanieu d'Antras"
[[publisher.indexmap]]
version = "1.9.1"
when = "2022-06-21"
@ -1196,6 +1203,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-encoder]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-metadata]]
version = "0.201.0"
when = "2024-02-27"
@ -1226,6 +1239,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-metadata]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-mutate]]
version = "0.201.0"
when = "2024-02-27"
@ -1256,6 +1275,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-mutate]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-smith]]
version = "0.201.0"
when = "2024-02-27"
@ -1286,6 +1311,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-smith]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmparser]]
version = "0.201.0"
when = "2024-02-27"
@ -1316,6 +1347,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmparser]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmprinter]]
version = "0.201.0"
when = "2024-02-27"
@ -1346,6 +1383,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmprinter]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmtime]]
version = "18.0.2"
when = "2024-02-28"
@ -1664,6 +1707,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wast]]
version = "206.0.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wat]]
version = "1.201.0"
when = "2024-02-27"
@ -1694,6 +1743,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wat]]
version = "1.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wiggle]]
version = "18.0.2"
when = "2024-02-28"
@ -1994,6 +2049,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wit-component]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wit-parser]]
version = "0.201.0"
when = "2024-02-27"
@ -2024,6 +2085,12 @@ when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wit-parser]]
version = "0.206.0"
when = "2024-04-25"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.witx]]
version = "0.9.1"
when = "2021-06-22"

Write Preview
Loading…
Cancel
Save