WIP

Author: rklaehn

src/rpc/client/tags.rs

@@ -11,7 +11,6 @@
 //!
 //! [`Client::delete`] can be used to delete a tag.
 use anyhow::Result;
-use bytes::Bytes;
 use futures_lite::{Stream, StreamExt};
 use quic_rpc::{client::BoxedConnector, Connector, RpcClient};
 use serde::{Deserialize, Serialize};
@@ -44,16 +43,22 @@ where
     }
 
     /// Get the value of a single tag
-    pub async fn get(&self, name: Tag) -> Result<Option<TagInfo>> {
-        let mut stream = self.rpc.server_streaming(ListRequest::single(name)).await?;
+    pub async fn get(&self, name: impl AsRef<[u8]>) -> Result<Option<TagInfo>> {
+        let mut stream = self
+            .rpc
+            .server_streaming(ListRequest::single(name.as_ref()))
+            .await?;
         Ok(stream.next().await.transpose()?)
     }
 
     /// Lists all tags.
-    pub async fn list_prefix(&self, prefix: &[u8]) -> Result<impl Stream<Item = Result<TagInfo>>> {
+    pub async fn list_prefix(
+        &self,
+        prefix: impl AsRef<[u8]>,
+    ) -> Result<impl Stream<Item = Result<TagInfo>>> {
         let stream = self
             .rpc
-            .server_streaming(ListRequest::prefix(Bytes::copy_from_slice(prefix).into()))
+            .server_streaming(ListRequest::prefix(prefix.as_ref()))
             .await?;
         Ok(stream.map(|res| res.map_err(anyhow::Error::from)))
     }

src/rpc/proto/tags.rs

@@ -87,8 +87,10 @@ pub struct ListRequest {
 
 impl ListRequest {
     /// List tags with a prefix
-    pub fn prefix(prefix: Tag) -> Self {
-        let mut to = prefix.0.to_vec();
+    pub fn prefix(prefix: &[u8]) -> Self {
+        let from = prefix.to_vec();
+        let mut to = from.clone();
+        let from = Bytes::from(from).into();
         let to = if next_prefix(&mut to) {
             Some(Bytes::from(to).into())
         } else {
@@ -97,21 +99,23 @@ impl ListRequest {
         Self {
             raw: true,
             hash_seq: true,
-            from: Some(prefix),
+            from: Some(from),
             to,
         }
     }
 
     /// List a single tag
-    pub fn single(name: Tag) -> Self {
-        let mut next = name.0.to_vec();
+    pub fn single(name: &[u8]) -> Self {
+        let from = name.to_vec();
+        let mut next = from.clone();
         increment_vec(&mut next);
-        let next = Bytes::from(next).into();
+        let from = Bytes::from(from).into();
+        let to = Bytes::from(next).into();
         Self {
             raw: true,
             hash_seq: true,
-            from: Some(name),
-            to: Some(next),
+            from: Some(from),
+            to: Some(to),
         }
     }