Update to the next version of the witx crate

crates/wasi-crypto/src/wiggle_interfaces/asymmetric_common.rs

@@ -1,7 +1,9 @@
 use super::{guest_types, WasiCryptoCtx};
 
 use std::convert::TryInto;
-use wasi_crypto::{ensure, CryptoError, KeyPairEncoding, PublicKeyEncoding, SecretKeyEncoding};
+use wasi_crypto::{
+    ensure, CryptoError, KeyPairEncoding, PublicKeyEncoding, SecretKeyEncoding, Version,
+};
 
 impl super::wasi_ephemeral_crypto_asymmetric_common::WasiEphemeralCryptoAsymmetricCommon
     for WasiCryptoCtx
@@ -57,7 +59,7 @@ impl super::wasi_ephemeral_crypto_asymmetric_common::WasiEphemeralCryptoAsymmetr
                 kp_old_handle.into(),
                 kp_new_handle.into(),
             )?
-            .into())
+            .0)
     }
 
     fn keypair_from_id(
@@ -69,7 +71,7 @@ impl super::wasi_ephemeral_crypto_asymmetric_common::WasiEphemeralCryptoAsymmetr
     ) -> Result<guest_types::Keypair, guest_types::CryptoErrno> {
         let kp_id = &*kp_id_ptr.as_array(kp_id_len).as_slice()?;
         Ok(self
-            .keypair_from_id(secrets_manager_handle.into(), kp_id, kp_version.into())?
+            .keypair_from_id(secrets_manager_handle.into(), kp_id, Version(kp_version))?
             .into())
     }
 
@@ -116,7 +118,7 @@ impl super::wasi_ephemeral_crypto_asymmetric_common::WasiEphemeralCryptoAsymmetr
         let (kp_id, version) = self.keypair_id(kp_handle.into())?;
         ensure!(kp_id.len() <= kp_id_buf.len(), CryptoError::Overflow.into());
         kp_id_buf.copy_from_slice(&kp_id);
-        Ok((kp_id.len().try_into()?, version.into()))
+        Ok((kp_id.len().try_into()?, version.0))
     }
 
     fn keypair_export(

crates/wasi-crypto/src/wiggle_interfaces/common.rs

@@ -111,7 +111,7 @@ impl super::wasi_ephemeral_crypto_common::WasiEphemeralCryptoCommon for WasiCryp
         Ok(self.secrets_manager_invalidate(
             secrets_manager_handle.into(),
             key_id,
-            key_version.into(),
+            Version(key_version),
         )?)
     }
 }
@@ -125,15 +125,3 @@ impl From<guest_types::AlgorithmType> for AlgorithmType {
         }
     }
 }
-
-impl From<guest_types::Version> for Version {
-    fn from(version: guest_types::Version) -> Self {
-        Version(version.into())
-    }
-}
-
-impl From<Version> for guest_types::Version {
-    fn from(version: Version) -> Self {
-        version.into()
-    }
-}

crates/wasi-crypto/src/wiggle_interfaces/symmetric.rs

@@ -1,7 +1,7 @@
 use super::{guest_types, WasiCryptoCtx};
 
 use std::convert::TryInto;
-use wasi_crypto::{ensure, CryptoError};
+use wasi_crypto::{ensure, CryptoError, Version};
 
 impl super::wasi_ephemeral_crypto_symmetric::WasiEphemeralCryptoSymmetric for WasiCryptoCtx {
     // --- secrets_manager
@@ -55,7 +55,7 @@ impl super::wasi_ephemeral_crypto_symmetric::WasiEphemeralCryptoSymmetric for Wa
                 symmetric_key_old_handle.into(),
                 symmetric_key_new_handle.into(),
             )?
-            .into())
+            .0)
     }
 
     fn symmetric_key_from_id(
@@ -72,7 +72,7 @@ impl super::wasi_ephemeral_crypto_symmetric::WasiEphemeralCryptoSymmetric for Wa
             .symmetric_key_from_id(
                 secrets_manager_handle.into(),
                 symmetric_key_id,
-                symmetric_key_version.into(),
+                Version(symmetric_key_version),
             )?
             .into())
     }
@@ -129,7 +129,7 @@ impl super::wasi_ephemeral_crypto_symmetric::WasiEphemeralCryptoSymmetric for Wa
             CryptoError::Overflow.into()
         );
         key_id_buf.copy_from_slice(&key_id);
-        Ok((key_id.len().try_into()?, version.into()))
+        Ok((key_id.len().try_into()?, version.0))
     }
 
     fn symmetric_key_close(

crates/wasi-nn/src/impl.rs

@@ -12,7 +12,7 @@ use wiggle::GuestPtr;
 
 #[derive(Debug, Error)]
 pub enum UsageError {
-    #[error("Only OpenVINO's IR is currently supported, passed encoding: {0}")]
+    #[error("Only OpenVINO's IR is currently supported, passed encoding: {0:?}")]
     InvalidEncoding(GraphEncoding),
     #[error("OpenVINO expects only two buffers (i.e. [ir, weights]), passed: {0}")]
     InvalidNumberOfBuilders(u32),

crates/wasi-nn/src/lib.rs

@@ -18,7 +18,6 @@ wasmtime_wiggle::wasmtime_integration!({
         wasi_ephemeral_nn => {
           name: WasiNn,
           docs: "An instantiated instance of the wasi-nn exports.",
-          function_override: {}
         }
     },
 });

crates/wasi-nn/src/witx.rs

@@ -6,23 +6,23 @@ use crate::ctx::WasiNnError;
 wiggle::from_witx!({
     witx: ["$WASI_ROOT/phases/ephemeral/witx/wasi_ephemeral_nn.witx"],
     ctx: WasiNnCtx,
-    errors: { errno => WasiNnError }
+    errors: { nn_errno => WasiNnError }
 });
 
-use types::Errno;
+use types::NnErrno;
 
 /// Wiggle generates code that performs some input validation on the arguments passed in by users of
 /// wasi-nn. Here we convert the validation error into one (or more, eventually) of the error
 /// variants defined in the witx.
 impl types::GuestErrorConversion for WasiNnCtx {
-    fn into_errno(&self, e: wiggle::GuestError) -> Errno {
+    fn into_nn_errno(&self, e: wiggle::GuestError) -> NnErrno {
         eprintln!("Guest error: {:?}", e);
-        Errno::InvalidArgument
+        NnErrno::InvalidArgument
     }
 }
 
 impl<'a> types::UserErrorConversion for WasiNnCtx {
-    fn errno_from_wasi_nn_error(&self, e: WasiNnError) -> Result<Errno, wiggle::Trap> {
+    fn nn_errno_from_wasi_nn_error(&self, e: WasiNnError) -> Result<NnErrno, wiggle::Trap> {
         eprintln!("Host error: {:?}", e);
         match e {
             WasiNnError::OpenvinoError(_) => unimplemented!(),
@@ -33,7 +33,7 @@ impl<'a> types::UserErrorConversion for WasiNnCtx {
 }
 
 /// Additionally, we must let Wiggle know which of our error codes represents a successful operation.
-impl wiggle::GuestErrorType for Errno {
+impl wiggle::GuestErrorType for NnErrno {
     fn success() -> Self {
         Self::Success
     }

crates/wiggle/Cargo.toml

@@ -12,7 +12,7 @@ include = ["src/**/*", "LICENSE"]
 
 [dependencies]
 thiserror = "1"
-witx = { path = "../wasi-common/WASI/tools/witx", version = "0.8.7", optional = true }
+witx = { path = "../wasi-common/WASI/tools/witx", version = "0.9", optional = true }
 wiggle-macro = { path = "macro", version = "0.23.0" }
 tracing = "0.1.15"
 bitflags = "1.2"

crates/wiggle/generate/Cargo.toml

@@ -14,7 +14,7 @@ include = ["src/**/*", "LICENSE"]
 [lib]
 
 [dependencies]
-witx = { version = "0.8.7", path = "../../wasi-common/WASI/tools/witx" }
+witx = { version = "0.9", path = "../../wasi-common/WASI/tools/witx" }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.3"

crates/wiggle/generate/src/error_transform.rs

@@ -49,10 +49,14 @@ impl ErrorTransform {
 
     pub fn for_abi_error(&self, tref: &TypeRef) -> Option<&UserErrorType> {
         match tref {
-            TypeRef::Name(nt) => self.m.iter().find(|u| u.abi_type.name == nt.name),
+            TypeRef::Name(nt) => self.for_name(nt),
             TypeRef::Value { .. } => None,
         }
     }
+
+    pub fn for_name(&self, nt: &NamedType) -> Option<&UserErrorType> {
+        self.m.iter().find(|u| u.abi_type.name == nt.name)
+    }
 }
 
 pub struct UserErrorType {