update wit_bindgen to latest version

ruslanti · ruslanti · commit f2cd046fffee · 2024-04-29T09:38:20.000+03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["derive", ".", "examples/*"]
 
 [workspace.package]
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -25,13 +25,14 @@ json = ["serde_json"]
 
 [dependencies]
 fastedge-derive = { path = "derive" }
-http = "^0.2"
+http = "1.1.0"
 bytes = "^1.5"
-wit-bindgen = "^0.9"
+wit-bindgen = "0.24.0"
 thiserror = "^1.0"
 tracing = "^0.1"
 mime = "^0.3"
 serde_json = { version = "^1.0", optional = true }
 
 [dev-dependencies]
 anyhow = "1.0"
+
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -27,11 +27,8 @@ pub fn http(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let func_name = &func.sig.ident;
 
     quote!(
-        use fastedge::bindgen::__link_section;
-        use fastedge::bindgen::exports;
-
+        use fastedge::http_handler::Guest;
         struct Component;
-        fastedge::export_http_reactor!(Component);
 
         #[inline(always)]
         fn internal_error(body: &str) -> ::fastedge::http_handler::Response {
@@ -46,7 +43,7 @@ pub fn http(_attr: TokenStream, item: TokenStream) -> TokenStream {
         #[no_mangle]
         #func
 
-        impl ::fastedge::http_handler::HttpHandler for Component {
+        impl Guest for Component {
             #[no_mangle]
             fn process(req: ::fastedge::http_handler::Request) -> ::fastedge::http_handler::Response {
 
@@ -68,5 +65,8 @@ pub fn http(_attr: TokenStream, item: TokenStream) -> TokenStream {
             }
         }
 
+        fastedge::export!(Component with_types_in fastedge);
+
+
     ).into()
 }
diff --git a/examples/classification-nn-demo/src/lib.rs b/examples/classification-nn-demo/src/lib.rs
@@ -12,7 +12,7 @@ use fastedge::wasi_nn::wasi::nn::inference;
 use fastedge::wasi_nn::wasi::nn::tensor;
 
 use crate::imagenet_classes::IMAGENET_CLASSES;
-use fastedge::wasi_nn::wasi::nn::inference::{GraphExecutionContext, TensorData};
+use fastedge::wasi_nn::wasi::nn::inference::{GraphExecutionContext};
 
 #[allow(dead_code)]
 mod image2tensor;
@@ -104,7 +104,7 @@ fn main(req: Request<Body>) -> Result<Response<Body>, Error> {
 }
 
 /// perform inference
-fn inference(model_name: Cow<str>, input: &[u8]) -> Result<TensorData, inference::Error> {
+fn inference(model_name: Cow<str>, input: &[u8]) -> Result<tensor::TensorData, inference::Error> {
     //load graph by name already loaded and initialized in FastEdge runtime
     let graph_handle = graph::load_by_name(&model_name)?;
     let context = inference::init_execution_context(graph_handle)?;
diff --git a/src/http_client.rs b/src/http_client.rs
@@ -3,7 +3,7 @@
 */
 use http::request::Parts;
 
-use crate::bindgen::gcore::fastedge::{http::Method, http_client};
+use crate::gcore::fastedge::{http::Method, http_client};
 use crate::body::Body;
 use crate::Error;
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,19 +1,15 @@
 /*
 * Copyright 2024 G-Core Innovations SARL
 */
-#![deny(missing_docs)]
-//#![deny(elided_lifetimes_in_paths)]
-
 //! # Rust SDK for FastEdge.
 
 pub extern crate http;
 
 pub use fastedge_derive::http;
-
 pub use http_client::send_request;
 
-pub use crate::bindgen::exports::gcore::fastedge::http_handler;
-use crate::bindgen::gcore::fastedge::http::{Error as HttpError, Method, Request, Response};
+pub use crate::exports::gcore::fastedge::http_handler;
+use crate::gcore::fastedge::http::{Error as HttpError, Method, Request, Response};
 
 /// Implementation of Outbound HTTP component
 mod http_client;
@@ -26,14 +22,11 @@ pub mod wasi_nn {
     });
 }
 
-pub mod bindgen {
-    #![allow(missing_docs)]
-    wit_bindgen::generate!({
-        world: "http-reactor",
-        path: "wit",
-        macro_export
-    });
-}
+wit_bindgen::generate!({
+    world: "http-reactor",
+    path: "wit",
+    pub_export_macro: true
+});
 
 /// Error type returned by [`send_request`][crate::bindgen::gcore::fastedge::http_client::send_request]
 #[derive(thiserror::Error, Debug)]
diff --git a/wasi-nn b/wasi-nn
@@ -1 +1 @@
-Subproject commit c1f8b87e923aedda02964c31b0e1d37e331ec402
+Subproject commit e2310b860db2ff1719c9d69816099b87e85fabdb
diff --git a/wit/http-client.wit b/wit/http-client.wit
@@ -1,5 +1,5 @@
 interface http-client {
-    use http.{request, response, error}
+    use http.{request, response, error};
 
-    send-request: func(req: request) -> result<response, error>
+    send-request: func(req: request) -> result<response, error>;
 }
diff --git a/wit/http-handler.wit b/wit/http-handler.wit
@@ -1,4 +1,4 @@
 interface http-handler {
-    use http.{request, response}
-    process: func(req: request) -> response
+    use http.{request, response};
+    process: func(req: request) -> response;
 }
diff --git a/wit/http.wit b/wit/http.wit
@@ -1,8 +1,8 @@
 interface http {
-    type http-status = u16
-    type body = list<u8>
-    type headers = list<tuple<string, string>>
-    type uri = string
+    type http-status = u16;
+    type body = list<u8>;
+    type headers = list<tuple<string, string>>;
+    type uri = string;
 
     enum method {
         get,
diff --git a/wit/world.wit b/wit/world.wit
@@ -1,8 +1,8 @@
-package gcore:fastedge
+package gcore:fastedge;
 
 world http-reactor {
-    import http
-    import http-client
+    import http;
+    import http-client;
 
-    export http-handler
+    export http-handler;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`interface http-client {`
`2`		`- use http.{request, response, error}`
	`2`	`+ use http.{request, response, error};`
`3`	`3`
`4`		`- send-request: func(req: request) -> result<response, error>`
	`4`	`+ send-request: func(req: request) -> result<response, error>;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`interface http-handler {`
`2`		`- use http.{request, response}`
`3`		`- process: func(req: request) -> response`
	`2`	`+ use http.{request, response};`
	`3`	`+ process: func(req: request) -> response;`
`4`	`4`	`}`