Update wit-bindgen

Signed-off-by: Ryan Levick <[email protected]>
mwatts · Oct 10, 2023 · 23dee4b · 23dee4b
1 parent 1574de2
commit 23dee4b
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/tests/core-wasi-test/Cargo.toml b/crates/core/tests/core-wasi-test/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 debug = true
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 
 [workspace]
diff --git a/crates/redis/tests/rust/Cargo.lock b/crates/redis/tests/rust/Cargo.lock
diff --git a/crates/redis/tests/rust/Cargo.toml b/crates/redis/tests/rust/Cargo.toml
@@ -8,6 +8,6 @@ authors = ["Radu Matei <[email protected]>"]
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 
 [workspace]
diff --git a/crates/trigger-http/benches/spin-http-benchmark/Cargo.toml b/crates/trigger-http/benches/spin-http-benchmark/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 url = "2.4.1"
 
 [workspace]
diff --git a/crates/trigger-http/tests/rust-http-test/Cargo.toml b/crates/trigger-http/tests/rust-http-test/Cargo.toml
@@ -8,6 +8,6 @@ authors = ["Radu Matei <[email protected]>"]
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 
 [workspace]
diff --git a/examples/spin-timer/app-example/Cargo.lock b/examples/spin-timer/app-example/Cargo.lock
diff --git a/examples/spin-timer/app-example/Cargo.toml b/examples/spin-timer/app-example/Cargo.toml
@@ -9,6 +9,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 
 [workspace]
diff --git a/sdk/rust/Cargo.toml b/sdk/rust/Cargo.toml
@@ -15,7 +15,7 @@ form_urlencoded = "1.0"
 http_types = { package = "http", version = "0.2" }
 spin-macro = { path = "macro" }
 thiserror = "1.0.37"
-wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "bad91ec820adc9d4a6048a455c57f1d4138079ea" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "46fba30bb667a3a4962f63b1cc28b84427b49114" }
 routefinder = "0.5.3"
 serde_json = { version = "1.0.96", optional = true }
 serde = { version = "1.0.163", optional = true }

diff --git a/sdk/rust/macro/wit/reactor.wit → sdk/rust/macro/wit/world.wit b/sdk/rust/macro/wit/reactor.wit → sdk/rust/macro/wit/world.wit
diff --git a/sdk/rust/src/key_value.rs b/sdk/rust/src/key_value.rs
@@ -9,9 +9,8 @@ use super::wit::v2::key_value;
 #[cfg(feature = "json")]
 use serde::{de::DeserializeOwned, Serialize};
 
-/// An open key-value store
-// TODO: use `#[doc(inline)]` as soon as wit-bindgen#688 is merged
-pub use key_value::Store;
+#[doc(inline)]
+pub use key_value::{Error, Store};
 
 impl Store {
     /// Open the default store.
@@ -22,9 +21,6 @@ impl Store {
     }
 }
 
-#[doc(inline)]
-pub use key_value::Error;
-
 impl Store {
     #[cfg(feature = "json")]
     /// Serialize the given data to JSON, then set it as the value for the specified `key`.

diff --git a/sdk/rust/src/sqlite.rs b/sdk/rust/src/sqlite.rs
@@ -1,10 +1,7 @@
 use super::wit::v2::sqlite;
 
-/// Represents a store in which key value tuples may be placed
-// TODO: use `#[doc(inline)]` as soon as wit-bindgen#688 is merged
-pub use sqlite::Connection;
 #[doc(inline)]
-pub use sqlite::{Error, QueryResult, RowResult, Value};
+pub use sqlite::{Connection, Error, QueryResult, RowResult, Value};
 
 impl sqlite::Connection {
     /// Open a connection to the default database

diff --git a/tests/http/headers-env-routes-test/Cargo.lock b/tests/http/headers-env-routes-test/Cargo.lock
diff --git a/tests/http/simple-spin-rust/Cargo.lock b/tests/http/simple-spin-rust/Cargo.lock