Move redis-types to redis interface

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/world/src/conversions.rs

@@ -151,23 +151,19 @@ mod redis {
     impl From<v1::redis::RedisParameter> for v2::redis::RedisParameter {
         fn from(value: v1::redis::RedisParameter) -> Self {
             match value {
-                v1::redis_types::RedisParameter::Int64(i) => {
-                    v2::redis_types::RedisParameter::Int64(i)
-                }
-                v1::redis_types::RedisParameter::Binary(b) => {
-                    v2::redis_types::RedisParameter::Binary(b)
-                }
+                v1::redis::RedisParameter::Int64(i) => v2::redis::RedisParameter::Int64(i),
+                v1::redis::RedisParameter::Binary(b) => v2::redis::RedisParameter::Binary(b),
             }
         }
     }
 
     impl From<v2::redis::RedisResult> for v1::redis::RedisResult {
         fn from(value: v2::redis::RedisResult) -> Self {
             match value {
-                v2::redis_types::RedisResult::Nil => v1::redis_types::RedisResult::Nil,
-                v2::redis_types::RedisResult::Status(s) => v1::redis_types::RedisResult::Status(s),
-                v2::redis_types::RedisResult::Int64(i) => v1::redis_types::RedisResult::Int64(i),
-                v2::redis_types::RedisResult::Binary(b) => v1::redis_types::RedisResult::Binary(b),
+                v2::redis::RedisResult::Nil => v1::redis::RedisResult::Nil,
+                v2::redis::RedisResult::Status(s) => v1::redis::RedisResult::Status(s),
+                v2::redis::RedisResult::Int64(i) => v1::redis::RedisResult::Int64(i),
+                v2::redis::RedisResult::Binary(b) => v1::redis::RedisResult::Binary(b),
             }
         }
     }

sdk/rust/src/lib.rs

@@ -53,8 +53,7 @@ pub mod http;
 pub mod redis {
     use std::hash::{Hash, Hasher};
 
-    pub use super::wit::v2::redis::{Connection, Error};
-    pub use super::wit::v2::redis_types::{Payload, RedisParameter, RedisResult};
+    pub use super::wit::v2::redis::{Connection, Error, Payload, RedisParameter, RedisResult};
 
     impl PartialEq for RedisResult {
         fn eq(&self, other: &Self) -> bool {

wit/preview2/redis-types.wit

@@ -1,6 +1,4 @@
 interface redis {
-  use redis-types.{payload, redis-parameter, redis-result}
-
   /// Errors related to interacting with Redis
   variant error {
       /// An invalid address string
@@ -52,4 +50,21 @@ interface redis {
     /// Execute an arbitrary Redis command and receive the result.
     execute: func(command: string, arguments: list<redis-parameter>) -> result<list<redis-result>, error>
   }
+
+  /// The message payload.
+  type payload = list<u8>
+
+  /// A parameter type for the general-purpose `execute` function.
+  variant redis-parameter {
+      int64(s64),
+      binary(payload)
+  }
+
+  /// A return type for the general-purpose `execute` function.
+  variant redis-result {
+      nil,
+      status(string),
+      int64(s64),
+      binary(payload)
+  }
 }