refact types

aamalev · Nov 28, 2022 · 4860604 · 4860604
1 parent 49017a7
commit 4860604
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/src/cluster.rs b/src/cluster.rs
@@ -1,11 +1,8 @@
 use crate::types;
-use deadpool_redis_cluster::{
-    redis::{aio::ConnectionLike, Value},
-    Config, Pool, Runtime,
-};
+use deadpool_redis_cluster::{redis::aio::ConnectionLike, Config, Pool, Runtime};
 use pyo3::{
     prelude::*,
-    types::{PyBytes, PyDict, PyList},
+    types::{PyBytes, PyDict},
 };
 use pyo3_asyncio::tokio::future_into_py;
 use redis_cluster_async::redis::FromRedisValue;
@@ -29,19 +26,6 @@ async fn execute<T: FromRedisValue>(
     Ok(result)
 }
 
-fn to_object(py: Python, value: Value) -> PyObject {
-    match value {
-        Value::Data(d) => PyBytes::new(py, &d).to_object(py),
-        Value::Nil => py.None(),
-        Value::Int(i) => i.to_object(py),
-        Value::Bulk(bulk) => {
-            PyList::new(py, bulk.into_iter().map(|v| to_object(py, v))).to_object(py)
-        }
-        Value::Status(s) => s.to_object(py),
-        Value::Okay => true.to_object(py),
-    }
-}
-
 #[pymethods]
 impl Client {
     #[new]
@@ -69,7 +53,7 @@ impl Client {
                 .req_packed_command(&redis_cluster_async::redis::cmd(&cmd.to_string()).arg(&args))
                 .await
                 .unwrap();
-            Ok(Python::with_gil(|py| to_object(py, value)))
+            Ok(Python::with_gil(|py| types::to_object(py, value)))
         })
     }
 

diff --git a/src/types.rs b/src/types.rs
@@ -1,5 +1,21 @@
-use deadpool_redis_cluster::redis::{RedisWrite, ToRedisArgs};
-use pyo3::FromPyObject;
+use deadpool_redis_cluster::redis::{RedisWrite, ToRedisArgs, Value};
+use pyo3::{
+    types::{PyBytes, PyList},
+    FromPyObject, PyObject, Python, ToPyObject,
+};
+
+pub fn to_object(py: Python, value: Value) -> PyObject {
+    match value {
+        Value::Data(d) => PyBytes::new(py, &d).to_object(py),
+        Value::Nil => py.None(),
+        Value::Int(i) => i.to_object(py),
+        Value::Bulk(bulk) => {
+            PyList::new(py, bulk.into_iter().map(|v| to_object(py, v))).to_object(py)
+        }
+        Value::Status(s) => s.to_object(py),
+        Value::Okay => true.to_object(py),
+    }
+}
 
 #[derive(FromPyObject)]
 pub enum Cmd {