bump wit-bindgen-rt to 0.26.0 with bitflags feature

DougAnderson444 · Jun 19, 2024 · 4840641 · 4840641
1 parent c784d92
commit 4840641
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,7 @@ description = "Tools for working with crypto seeds."
 [workspace.dependencies]
 seed-keeper-core = { path = "crates/seed-keeper-core" }
 seed-keeper-events = { path = "crates/seed-keeper-events" }
-bitflags = "2.5.0"
-wit-bindgen-rt = "0.24.0"
+wit-bindgen-rt = { version = "0.26.0", features = ["bitflags"] }
 wurbo = "0.3.2"
 
 [package]

diff --git a/crates/seed-keeper-wallet/Cargo.toml b/crates/seed-keeper-wallet/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitflags = { workspace = true }
-wit-bindgen-rt = { workspace = true }
+wit-bindgen-rt = { workspace = true, features = ["bitflags"] }
 seed-keeper-core = { workspace = true }
 
 [dev-dependencies]

diff --git a/crates/seed-keeper-wallet/src/bindings.rs b/crates/seed-keeper-wallet/src/bindings.rs
@@ -1,8 +1,10 @@
-// Generated by `wit-bindgen` 0.21.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.25.0. DO NOT EDIT!
 // Options used:
+#[allow(dead_code)]
 pub mod seed_keeper {
+    #[allow(dead_code)]
     pub mod wallet {
-        #[allow(clippy::all)]
+        #[allow(dead_code, clippy::all)]
         pub mod types {
             #[used]
             #[doc(hidden)]
@@ -32,10 +34,13 @@ pub mod seed_keeper {
         }
     }
 }
+#[allow(dead_code)]
 pub mod exports {
+    #[allow(dead_code)]
     pub mod seed_keeper {
+        #[allow(dead_code)]
         pub mod wallet {
-            #[allow(clippy::all)]
+            #[allow(dead_code, clippy::all)]
             pub mod config {
                 #[used]
                 #[doc(hidden)]
@@ -56,6 +61,8 @@ pub mod exports {
                     arg5: *mut u8,
                     arg6: usize,
                 ) -> *mut u8 {
+                    #[cfg(target_arch = "wasm32")]
+                    _rt::run_ctors_once();
                     let len0 = arg1;
                     let len1 = arg3;
                     let result3 = T::set_config(
@@ -109,6 +116,8 @@ pub mod exports {
                 #[doc(hidden)]
                 #[allow(non_snake_case)]
                 pub unsafe fn _export_get_encrypted_cabi<T: Guest>() -> *mut u8 {
+                    #[cfg(target_arch = "wasm32")]
+                    _rt::run_ctors_once();
                     let result0 = T::get_encrypted();
                     let ptr1 = _RET_AREA.0.as_mut_ptr().cast::<u8>();
                     match result0 {
@@ -155,6 +164,8 @@ pub mod exports {
                 #[doc(hidden)]
                 #[allow(non_snake_case)]
                 pub unsafe fn _export_get_seed_cabi<T: Guest>() -> *mut u8 {
+                    #[cfg(target_arch = "wasm32")]
+                    _rt::run_ctors_once();
                     let result0 = T::get_seed();
                     let ptr1 = _RET_AREA.0.as_mut_ptr().cast::<u8>();
                     match result0 {
@@ -249,6 +260,11 @@ pub mod exports {
 }
 mod _rt {
     pub use alloc_crate::vec::Vec;
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn run_ctors_once() {
+        wit_bindgen_rt::run_ctors_once();
+    }
     pub unsafe fn invalid_enum_discriminant<T>() -> T {
         if cfg!(debug_assertions) {
             panic!("invalid enum discriminant")
@@ -297,7 +313,7 @@ macro_rules! __export_keeper_impl {
 pub(crate) use __export_keeper_impl as export;
 
 #[cfg(target_arch = "wasm32")]
-#[link_section = "component-type:wit-bindgen:0.21.0:keeper:encoded world"]
+#[link_section = "component-type:wit-bindgen:0.25.0:keeper:encoded world"]
 #[doc(hidden)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 417] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xa4\x02\x01A\x02\x01\
@@ -308,7 +324,7 @@ A\x05\x01B\x04\x01p}\x01k\0\x01r\x03\x08username\0\x08password\0\x09encrypted\x0
 \x01\x04\x01s\x01@\0\0\x05\x04\0\x0dget-encrypted\x01\x06\x04\0\x08get-seed\x01\x06\
 \x04\x01\x1fseed-keeper:wallet/[email protected]\x05\x02\x04\x01\x1fseed-keeper:walle\
 t/[email protected]\x04\0\x0b\x0c\x01\0\x06keeper\x03\0\0\0G\x09producers\x01\x0cproc\
-essed-by\x02\x0dwit-component\x070.201.0\x10wit-bindgen-rust\x060.21.0";
+essed-by\x02\x0dwit-component\x070.208.1\x10wit-bindgen-rust\x060.25.0";
 
 #[inline(never)]
 #[doc(hidden)]

diff --git a/crates/seed-keeper-wit-ui/Cargo.toml b/crates/seed-keeper-wit-ui/Cargo.toml
@@ -7,8 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-bitflags = { workspace = true }
-wit-bindgen-rt = { workspace = true }
+wit-bindgen-rt = { workspace = true, features = ["bitflags"] }
 wurbo = "0.2.0" 
 base64ct = { version = "1.6.0", features = ["alloc"] }
 seed-keeper-events = { path = "../seed-keeper-events" }

diff --git a/crates/seed-keeper-wit-ui/src/bindings.rs b/crates/seed-keeper-wit-ui/src/bindings.rs
@@ -1,8 +1,10 @@
-// Generated by `wit-bindgen` 0.21.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.25.0. DO NOT EDIT!
 // Options used:
+#[allow(dead_code)]
 pub mod seed_keeper {
+    #[allow(dead_code)]
     pub mod wallet {
-        #[allow(clippy::all)]
+        #[allow(dead_code, clippy::all)]
         pub mod types {
             #[used]
             #[doc(hidden)]
@@ -31,7 +33,7 @@ pub mod seed_keeper {
             }
         }
 
-        #[allow(clippy::all)]
+        #[allow(dead_code, clippy::all)]
         pub mod config {
             #[used]
             #[doc(hidden)]
@@ -226,8 +228,9 @@ pub mod seed_keeper {
             }
         }
     }
+    #[allow(dead_code)]
     pub mod wit_ui {
-        #[allow(clippy::all)]
+        #[allow(dead_code, clippy::all)]
         pub mod wurbo_types {
             #[used]
             #[doc(hidden)]
@@ -319,7 +322,7 @@ pub mod seed_keeper {
             }
         }
 
-        #[allow(clippy::all)]
+        #[allow(dead_code, clippy::all)]
         pub mod wurbo_in {
             #[used]
             #[doc(hidden)]
@@ -382,10 +385,13 @@ pub mod seed_keeper {
         }
     }
 }
+#[allow(dead_code)]
 pub mod exports {
+    #[allow(dead_code)]
     pub mod seed_keeper {
+        #[allow(dead_code)]
         pub mod wit_ui {
-            #[allow(clippy::all)]
+            #[allow(dead_code, clippy::all)]
             pub mod wurbo_out {
                 #[used]
                 #[doc(hidden)]
@@ -412,6 +418,8 @@ pub mod exports {
                     arg11: *mut u8,
                     arg12: usize,
                 ) -> *mut u8 {
+                    #[cfg(target_arch = "wasm32")]
+                    _rt::run_ctors_once();
                     use super::super::super::super::seed_keeper::wit_ui::wurbo_types::Context as V7;
                     let v7 = match arg0 {
                         0 => {
@@ -555,6 +563,8 @@ pub mod exports {
                     arg1: *mut u8,
                     arg2: usize,
                 ) {
+                    #[cfg(target_arch = "wasm32")]
+                    _rt::run_ctors_once();
                     T::activate(match arg0 {
                         0 => None,
                         1 => {
@@ -636,6 +646,11 @@ mod _rt {
             core::hint::unreachable_unchecked()
         }
     }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn run_ctors_once() {
+        wit_bindgen_rt::run_ctors_once();
+    }
     pub unsafe fn cabi_dealloc(ptr: *mut u8, size: usize, align: usize) {
         if size == 0 {
             return;
@@ -676,7 +691,7 @@ macro_rules! __export_seedworld_impl {
 pub(crate) use __export_seedworld_impl as export;
 
 #[cfg(target_arch = "wasm32")]
-#[link_section = "component-type:wit-bindgen:0.21.0:seedworld:encoded world"]
+#[link_section = "component-type:wit-bindgen:0.25.0:seedworld:encoded world"]
 #[doc(hidden)]
 pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 982] = *b"\
 \0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xd6\x06\x01A\x02\x01\
@@ -700,7 +715,7 @@ messages\x01\0\x04\0\x04emit\x01\x03\x03\x01!seed-keeper:wit-ui/[email protected]\x
 \x01@\x01\x09selectors\x05\x01\0\x04\0\x08activate\x01\x06\x04\x01\"seed-keeper:\
 wit-ui/[email protected]\x05\x07\x04\x01\"seed-keeper:wit-ui/[email protected]\x04\0\
 \x0b\x0f\x01\0\x09seedworld\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dw\
-it-component\x070.201.0\x10wit-bindgen-rust\x060.21.0";
+it-component\x070.208.1\x10wit-bindgen-rust\x060.25.0";
 
 #[inline(never)]
 #[doc(hidden)]

diff --git a/examples/crates/aggregate-wit-ui/Cargo.toml b/examples/crates/aggregate-wit-ui/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitflags = { workspace = true }
-wit-bindgen-rt = { workspace = true }
+wit-bindgen-rt = { workspace = true, features = ["bitflags"] }
 wurbo = { workspace = true }
 minijinja = { version = "1.0.12", features = ["json", "loader"] }