Bump wit-bindgen to v0.43.0

Signed-off-by: Brian Hardock <[email protected]>

Author: fibonacci1729

Cargo.lock

@@ -91,7 +91,7 @@ rust-version = "1.78"
 homepage = "https://spinframework.dev/rust-components"
 
 [workspace.dependencies]
-wit-bindgen = "0.16.0"
+wit-bindgen = "0.43.0"
 futures = "0.3.28"
 once_cell = "1.18.0"
 # Pin to the last version that targeted WASI 0.2.0

Cargo.toml

@@ -159,19 +159,19 @@ pub fn http_component(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
             impl From<self::preamble::wasi::http::types::IncomingRequest> for ::spin_sdk::http::IncomingRequest {
                 fn from(req: self::preamble::wasi::http::types::IncomingRequest) -> Self {
-                    unsafe { Self::from_handle(req.into_handle()) }
+                    unsafe { Self::from_handle(req.take_handle()) }
                 }
             }
 
             impl From<::spin_sdk::http::OutgoingResponse> for self::preamble::wasi::http::types::OutgoingResponse {
                 fn from(resp: ::spin_sdk::http::OutgoingResponse) -> Self {
-                    unsafe { Self::from_handle(resp.into_handle()) }
+                    unsafe { Self::from_handle(resp.take_handle()) }
                 }
             }
 
             impl From<self::preamble::wasi::http::types::ResponseOutparam> for ::spin_sdk::http::ResponseOutparam {
                 fn from(resp: self::preamble::wasi::http::types::ResponseOutparam) -> Self {
-                    unsafe { Self::from_handle(resp.into_handle()) }
+                    unsafe { Self::from_handle(resp.take_handle()) }
                 }
             }
         }
@@ -187,10 +187,6 @@ enum Export {
 }
 
 fn preamble(export: Export) -> proc_macro2::TokenStream {
-    let export_decl = match export {
-        Export::WasiHttp => quote!("wasi:http/incoming-handler": Spin),
-        Export::Redis => quote!("fermyon:spin/inbound-redis": Spin),
-    };
     let world = match export {
         Export::WasiHttp => quote!("wasi-http-trigger"),
         Export::Redis => quote!("redis-trigger"),
@@ -201,10 +197,9 @@ fn preamble(export: Export) -> proc_macro2::TokenStream {
             world: #world,
             path: #WIT_PATH,
             runtime_path: "::spin_sdk::wit_bindgen::rt",
-            exports: {
-                #export_decl
-            }
+            generate_all,
         });
         pub struct Spin;
+        export!(Spin);
     }
 }

crates/macro/src/lib.rs

@@ -30,19 +30,13 @@ pub mod wit {
             "wasi:io/[email protected]": ::wasi::io::error,
             "wasi:io/[email protected]": ::wasi::io::streams,
             "wasi:io/[email protected]": ::wasi::io::poll,
-        }
+        },
+        generate_all,
     });
     pub use fermyon::spin2_0_0 as v2;
     pub use spin::postgres::postgres as pg3;
 }
 
-/// Needed by the export macro
-///
-/// See [this commit](https://github.com/bytecodealliance/wit-bindgen/pull/394/commits/9d2ea88f986f4a883ba243449e3a070cac18958e) for more info.
-#[cfg(target_arch = "wasm32")]
-#[doc(hidden)]
-pub use wit::__link_section;
-
 #[export_name = concat!("spin-sdk-version-", env!("SDK_VERSION"))]
 extern "C" fn __spin_sdk_version() {}
 

src/lib.rs

@@ -35,8 +35,8 @@ interface postgres {
       int16(s16),
       int32(s32),
       int64(s64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       date(tuple<s32, u8, u8>), // (year, month, day)
@@ -57,8 +57,8 @@ interface postgres {
       int16(s16),
       int32(s32),
       int64(s64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       date(tuple<s32, u8, u8>), // (year, month, day)

wit/deps/[email protected]/postgres.wit

@@ -10,15 +10,15 @@ interface llm {
 		/// Note: the backing implementation may return less tokens.
 		max-tokens: u32,
 		/// The amount the model should avoid repeating tokens.
-		repeat-penalty: float32,
+		repeat-penalty: f32,
 		/// The number of tokens the model should apply the repeat penalty to.
 		repeat-penalty-last-n-token-count: u32,
 		/// The randomness with which the next token is selected.
-		temperature: float32,
+		temperature: f32,
 		/// The number of possible next tokens the model will choose from.
 		top-k: u32,
 		/// The probability total of next tokens the model will choose from.
-		top-p: float32
+		top-p: f32
 	}
 
 	/// The set of errors which may be raised by functions in this interface
@@ -57,7 +57,7 @@ interface llm {
 	/// Result of generating embeddings
 	record embeddings-result {
 		/// The embeddings generated by the request
-		embeddings: list<list<float32>>,
+		embeddings: list<list<f32>>,
 		/// Usage related to the embeddings generation request
 		usage: embeddings-usage
 	}

wit/deps/[email protected]/llm.wit

@@ -37,8 +37,8 @@ interface rdbms-types {
       uint16(u16),
       uint32(u32),
       uint64(u64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       db-null,
@@ -56,8 +56,8 @@ interface rdbms-types {
       uint16(u16),
       uint32(u32),
       uint64(u64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       db-null,

wit/deps/[email protected]/rdbms-types.wit

@@ -42,7 +42,7 @@ interface sqlite {
   /// A single column's result from a database query
   variant value {
     integer(s64),
-    real(float64),
+    real(f64),
     text(string),
     blob(list<u8>),
     null

wit/deps/[email protected]/sqlite.wit

@@ -10,15 +10,15 @@ interface llm {
 		/// Note: the backing implementation may return less tokens.
 		max-tokens: u32,
 		/// The amount the model should avoid repeating tokens.
-		repeat-penalty: float32,
+		repeat-penalty: f32,
 		/// The number of tokens the model should apply the repeat penalty to.
 		repeat-penalty-last-n-token-count: u32,
 		/// The randomness with which the next token is selected.
-		temperature: float32,
+		temperature: f32,
 		/// The number of possible next tokens the model will choose from.
 		top-k: u32,
 		/// The probability total of next tokens the model will choose from.
-		top-p: float32
+		top-p: f32
 	}
 
 	/// The set of errors which may be raised by functions in this interface
@@ -57,7 +57,7 @@ interface llm {
 	/// Result of generating embeddings
 	record embeddings-result {
 		/// The embeddings generated by the request
-		embeddings: list<list<float32>>,
+		embeddings: list<list<f32>>,
 		/// Usage related to the embeddings generation request
 		usage: embeddings-usage
 	}

wit/deps/spin@unversioned/llm.wit

@@ -26,8 +26,8 @@ interface rdbms-types {
       uint16(u16),
       uint32(u32),
       uint64(u64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       db-null,
@@ -44,8 +44,8 @@ interface rdbms-types {
       uint16(u16),
       uint32(u32),
       uint64(u64),
-      floating32(float32),
-      floating64(float64),
+      floating32(f32),
+      floating64(f64),
       str(string),
       binary(list<u8>),
       db-null,