Update wit-bindgen 0.17.1 -> 0.25.0 (#60)

bytecodealliance · Jun 5, 2024 · 7a1d14c · 7a1d14c
1 parent 6585bdf
commit 7a1d14c
Show file tree

Hide file tree

Showing 11 changed files with 399 additions and 301 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,4 +53,4 @@ wasmparser = "0.121.2"
 
 [workspace.dependencies]
 anyhow = "1"
-wit-bindgen = "0.17.1"
+wit-bindgen = "0.25.0"
diff --git a/lib/virtual_adapter.debug.wasm b/lib/virtual_adapter.debug.wasm
diff --git a/lib/virtual_adapter.wasm b/lib/virtual_adapter.wasm
diff --git a/src/lib.rs b/src/lib.rs
@@ -156,12 +156,30 @@ impl WasiVirt {
             Default::default()
         };
 
+        let component_type_section_id = module
+            .customs
+            .iter()
+            .find_map(|(id, section)| {
+                let name = section.name();
+                if name.starts_with("component-type:")
+                    && section.as_any().is::<walrus::RawCustomSection>()
+                {
+                    Some(id)
+                } else {
+                    None
+                }
+            })
+            .context("Unable to find component type section")?;
+
         // decode the component custom section to strip out the unused world exports
         // before reencoding.
-        let mut component_section = module
+        let mut component_section = *module
             .customs
-            .remove_raw("component-type:virtual-adapter")
-            .context("Unable to find component section")?;
+            .delete(component_type_section_id)
+            .context("Unable to find component section")?
+            .into_any()
+            .downcast::<walrus::RawCustomSection>()
+            .unwrap();
 
         let (mut resolve, pkg_id) = match wit_component::decode(VIRT_WIT_METADATA)? {
             DecodedWasm::WitPackage(resolve, pkg_id) => (resolve, pkg_id),

diff --git a/tests/components/do-everything/src/lib.rs b/tests/components/do-everything/src/lib.rs
@@ -8,9 +8,6 @@ extern crate rand;
 wit_bindgen::generate!({
     path: "../../../wit",
     world: "virt-test",
-    exports: {
-        world: VirtTestComponent
-    },
 });
 
 struct VirtTestComponent;
@@ -34,3 +31,5 @@ impl Guest for VirtTestComponent {
         unimplemented!();
     }
 }
+
+export!(VirtTestComponent);
diff --git a/tests/components/file-read/src/lib.rs b/tests/components/file-read/src/lib.rs
@@ -3,9 +3,6 @@ use std::{fs, io::ErrorKind};
 wit_bindgen::generate!({
   path: "../../../wit",
   world: "virt-test",
-  exports: {
-    world: VirtTestComponent
-},
 });
 
 struct VirtTestComponent;
@@ -67,3 +64,5 @@ impl Guest for VirtTestComponent {
         unimplemented!();
     }
 }
+
+export!(VirtTestComponent);
diff --git a/tests/components/get-env/src/lib.rs b/tests/components/get-env/src/lib.rs
@@ -3,9 +3,6 @@ use std::env;
 wit_bindgen::generate!({
     path: "../../../wit",
     world: "virt-test",
-    exports: {
-        world: VirtTestComponent
-    },
 });
 
 struct VirtTestComponent;
@@ -21,3 +18,5 @@ impl Guest for VirtTestComponent {
         unimplemented!();
     }
 }
+
+export!(VirtTestComponent);
diff --git a/tests/components/stdio/src/lib.rs b/tests/components/stdio/src/lib.rs
@@ -3,9 +3,6 @@ use std::env;
 wit_bindgen::generate!({
     path: "../../../wit",
     world: "virt-test",
-    exports: {
-        world: VirtTestComponent
-    },
 });
 
 struct VirtTestComponent;
@@ -21,3 +18,5 @@ impl Guest for VirtTestComponent {
         println!("Hello world");
     }
 }
+
+export!(VirtTestComponent);