wit-component - cargo Package Compare versions

Comparing version 0.240.0 to 0.241.2

.cargo_vcs_info.json

 {
   "git": {
-    "sha1": "dafe42f8f543ca76429d5ef7b5e84f41ae8e73fe"
+    "sha1": "a1712da0354bea5a38275d7ddf30f707b5757a68"
   },
   "path_in_vcs": "crates/wit-component"
 }

Cargo.lock

@@ -1198,8 +1198,8 @@ # This file is automatically @generated by Cargo.
 name = "wasm-encoder"
-version = "0.240.0"
+version = "0.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06d642d8c5ecc083aafe9ceb32809276a304547a3a6eeecceb5d8152598bc71f"
+checksum = "e01164c9dda68301e34fdae536c23ed6fe90ce6d97213ccc171eebbd3d02d6b8"
 dependencies = [
  "leb128fmt",
- "wasmparser 0.240.0",
+ "wasmparser 0.241.2",
 ]
@@ -1209,5 +1209,5 @@
 name = "wasm-metadata"
-version = "0.240.0"
+version = "0.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee093e1e1ccffa005b9b778f7a10ccfd58e25a20eccad294a1a93168d076befb"
+checksum = "876fe286f2fa416386deedebe8407e6f19e0b5aeaef3d03161e77a15fa80f167"
 dependencies = [
@@ -1223,4 +1223,4 @@ "anyhow",
  "url",
- "wasm-encoder 0.240.0",
- "wasmparser 0.240.0",
+ "wasm-encoder 0.241.2",
+ "wasmparser 0.241.2",
 ]
@@ -1243,5 +1243,5 @@
 name = "wasmparser"
-version = "0.240.0"
+version = "0.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4"
+checksum = "46d90019b1afd4b808c263e428de644f3003691f243387d30d673211ee0cb8e8"
 dependencies = [
@@ -1267,9 +1267,9 @@ "bitflags",
 name = "wasmprinter"
-version = "0.240.0"
+version = "0.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84d6e25c198da67d0150ee7c2c62d33d784f0a565d1e670bdf1eeccca8158bc"
+checksum = "68832d23d180e4b8774103c2992b48a1b4d1b62474fd5807efa2e38c7914c4e2"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser 0.240.0",
+ "wasmparser 0.241.2",
 ]
@@ -1489,5 +1489,5 @@
 name = "wast"
-version = "240.0.0"
+version = "241.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0efe1c93db4ac562b9733e3dca19ed7fc878dba29aef22245acf84f13da4a19"
+checksum = "63f66e07e2ddf531fef6344dbf94d112df7c2f23ed6ffb10962e711500b8d816"
 dependencies = [
@@ -1498,3 +1498,3 @@ "bumpalo",
  "unicode-width",
- "wasm-encoder 0.240.0",
+ "wasm-encoder 0.241.2",
 ]
@@ -1504,5 +1504,5 @@
 name = "wat"
-version = "1.240.0"
+version = "1.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec9b6eab7ecd4d639d78515e9ea491c9bacf494aa5eda10823bd35992cf8c1e"
+checksum = "45f923705c40830af909c5dec2352ec2821202e4a66008194585e1917458a26d"
 dependencies = [
@@ -1689,3 +1689,3 @@ "wast",
 name = "wit-component"
-version = "0.240.0"
+version = "0.241.2"
 dependencies = [
@@ -1703,10 +1703,10 @@ "anyhow",
  "serde_json",
- "wasm-encoder 0.240.0",
+ "wasm-encoder 0.241.2",
  "wasm-metadata",
- "wasmparser 0.240.0",
- "wasmprinter 0.240.0",
+ "wasmparser 0.241.2",
+ "wasmprinter 0.241.2",
  "wasmtime",
  "wast",
  "wat",
- "wit-parser 0.240.0",
+ "wit-parser 0.241.2",
 ]
@@ -1734,5 +1734,5 @@
 name = "wit-parser"
-version = "0.240.0"
+version = "0.241.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9875ea3fa272f57cc1fc50f225a7b94021a7878c484b33792bccad0d93223439"
+checksum = "09ef1c6ad67f35c831abd4039c02894de97034100899614d1c44e2268ad01c91"
 dependencies = [
@@ -1748,3 +1748,3 @@ "anyhow",
  "unicode-xid",
- "wasmparser 0.240.0",
+ "wasmparser 0.241.2",
 ]
@@ -1751,0 +1751,0 @@

Cargo.toml

@@ -16,3 +16,3 @@ # THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
 name = "wit-component"
-version = "0.240.0"
+version = "0.241.2"
 authors = ["Peter Huene <[e-mail]>"]
@@ -100,3 +100,3 @@ build = false
 [dependencies.wasm-encoder]
-version = "0.240.0"
+version = "0.241.2"
 features = [
@@ -109,7 +109,7 @@ "std",
 [dependencies.wasm-metadata]
-version = "0.240.0"
+version = "0.241.2"
 default-features = false
 
 [dependencies.wasmparser]
-version = "0.240.0"
+version = "0.241.2"
 features = [
@@ -124,3 +124,3 @@ "simd",
 [dependencies.wast]
-version = "240.0.0"
+version = "241.0.2"
 optional = true
@@ -130,3 +130,3 @@ default-features = false
 [dependencies.wat]
-version = "1.240.0"
+version = "1.241.2"
 optional = true
@@ -136,3 +136,3 @@ default-features = false
 [dependencies.wit-parser]
-version = "0.240.0"
+version = "0.241.2"
 features = [
@@ -156,3 +156,3 @@ "decoding",
 [dev-dependencies.wasm-metadata]
-version = "0.240.0"
+version = "0.241.2"
 features = ["oci"]
@@ -162,3 +162,3 @@ default-features = false
 [dev-dependencies.wasmparser]
-version = "0.240.0"
+version = "0.241.2"
 features = [
@@ -173,3 +173,3 @@ "simd",
 [dev-dependencies.wasmprinter]
-version = "0.240.0"
+version = "0.241.2"
 features = ["component-model"]
@@ -179,3 +179,3 @@ default-features = false
 [dev-dependencies.wat]
-version = "1.240.0"
+version = "1.241.2"
 features = ["component-model"]
@@ -182,0 +182,0 @@ default-features = false

src/encoding/types.rs

@@ -13,2 +13,3 @@ use super::EncodingState;
 pub struct FunctionKey<'a> {
+    async_: bool,
     params: &'a [(String, Type)],
@@ -102,2 +103,3 @@ result: &'a Option<Type>,
         let key = FunctionKey {
+            async_: func.kind.is_async(),
             params: &func.params,
@@ -120,3 +122,3 @@ result: &func.result,
         let (index, mut f) = self.define_function_type();
-        f.params(params).result(result);
+        f.async_(func.kind.is_async()).params(params).result(result);
         let prev = self.type_encoding_maps().func_type_map.insert(key, index);
@@ -123,0 +125,0 @@ assert!(prev.is_none());

src/gc.rs

@@ -942,2 +942,3 @@ use self::bitvec::BitVec;
         $(
+            #[allow(unused_variables)]
             fn $visit(&mut self $(, $($arg: $argty),*)?)  {
@@ -944,0 +945,0 @@ $(

src/linking.rs

@@ -372,2 +372,6 @@ //! Support for "pseudo-dynamic", shared-everything linking of Wasm modules into a component.
 
+        // The libc.so in WASI-SDK 28+ requires these:
+        add_global_export("__stack_high", stack_size_bytes, true);
+        add_global_export("__stack_low", 0, true);
+
         for metadata in metadata {
@@ -1645,8 +1649,12 @@ memory_offset = align(memory_offset, 1 << metadata.mem_info.memory_alignment);
                 .map(global_item)
-                .chain(["__heap_base", "__heap_end"].into_iter().map(|name| Item {
-                    alias: name.into(),
-                    kind: ExportKind::Global,
-                    which: MainOrAdapter::Main,
-                    name: name.into(),
-                }))
+                .chain(
+                    ["__heap_base", "__heap_end", "__stack_high", "__stack_low"]
+                        .into_iter()
+                        .map(|name| Item {
+                            alias: name.into(),
+                            kind: ExportKind::Global,
+                            which: MainOrAdapter::Main,
+                            name: name.into(),
+                        }),
+                )
                 .collect();
@@ -1653,0 +1661,0 @@

src/linking/metadata.rs

@@ -392,3 +392,4 @@ //! Support for parsing and analyzing [dynamic
                                     match name {
-                                        "__heap_base" | "__heap_end" => (),
+                                        "__heap_base" | "__heap_end" | "__stack_high"
+                                        | "__stack_low" => (),
                                         _ => {
@@ -395,0 +396,0 @@ result.memory_address_imports.insert(name);

src/metadata.rs

@@ -53,3 +53,3 @@ //! Definition for encoding of custom sections within core wasm modules of
 use wasmparser::{BinaryReader, Encoding, Parser, Payload};
-use wit_parser::{Package, PackageName, Resolve, World, WorldId, WorldItem, WorldKey};
+use wit_parser::{CloneMaps, Package, PackageName, Resolve, World, WorldId, WorldItem, WorldKey};
 
@@ -417,3 +417,3 @@ const CURRENT_VERSION: u8 = 0x04;
         self.resolve
-            .merge_worlds(world, self.world)
+            .merge_worlds(world, self.world, &mut CloneMaps::default())
             .context("failed to merge worlds from two documents")?;
@@ -420,0 +420,0 @@

src/printing.rs

@@ -490,7 +490,3 @@ use anyhow::{Result, anyhow, bail};
                     WorldItem::Function(f) => {
-                        // Note that `f.item_name()` is used here instead of
-                        // `name` because if this is an async function then we
-                        // want to print `foo`, not `[async]foo` under the
-                        // `import` name.
-                        self.print_name_type(f.item_name(), TypeKind::Other);
+                        self.print_name_type(&f.name, TypeKind::Other);
                         self.output.str(": ");
@@ -497,0 +493,0 @@ self.print_function(resolve, f)?;

No alert changes

No metric changes