Fixup privacy in raw::requests

Signed-off-by: Nick Cameron <nrc@ncameron.org>

Author: nrc

src/raw/client.rs

@@ -1,11 +1,7 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::requests::{
-    BatchDeleteInner, BatchGetInner, BatchPutInner, BatchScanInner, DeleteInner, DeleteRangeInner,
-    GetInner, PutInner, ScanInner,
-};
 use super::{BatchDelete, BatchGet, BatchPut, BatchScan, Delete, DeleteRange, Get, Put, Scan};
-use crate::{rpc::RpcClient, Config, Key, BoundRange, KvPair, Result, Value};
+use crate::{rpc::RpcClient, BoundRange, Config, Key, KvPair, Result, Value};
 
 use futures::prelude::*;
 use futures::task::{Context, Poll};
@@ -55,7 +51,7 @@ impl Client {
     /// # });
     /// ```
     pub fn get(&self, key: impl Into<Key>) -> Get {
-        Get::new(self.rpc(), GetInner::new(key.into()))
+        Get::new(self.rpc(), key.into())
     }
 
     /// Create a new [`BatchGet`](BatchGet) request.
@@ -76,10 +72,7 @@ impl Client {
     /// # });
     /// ```
     pub fn batch_get(&self, keys: impl IntoIterator<Item = impl Into<Key>>) -> BatchGet {
-        BatchGet::new(
-            self.rpc(),
-            BatchGetInner::new(keys.into_iter().map(Into::into).collect()),
-        )
+        BatchGet::new(self.rpc(), keys.into_iter().map(Into::into).collect())
     }
 
     /// Create a new [`Put`](Put) request.
@@ -100,7 +93,7 @@ impl Client {
     /// # });
     /// ```
     pub fn put(&self, key: impl Into<Key>, value: impl Into<Value>) -> Put {
-        Put::new(self.rpc(), PutInner::new(key.into(), value.into()))
+        Put::new(self.rpc(), key.into(), value.into())
     }
 
     /// Create a new [`BatchPut`](BatchPut) request.
@@ -122,10 +115,7 @@ impl Client {
     /// # });
     /// ```
     pub fn batch_put(&self, pairs: impl IntoIterator<Item = impl Into<KvPair>>) -> BatchPut {
-        BatchPut::new(
-            self.rpc(),
-            BatchPutInner::new(pairs.into_iter().map(Into::into).collect()),
-        )
+        BatchPut::new(self.rpc(), pairs.into_iter().map(Into::into).collect())
     }
 
     /// Create a new [`Delete`](Delete) request.
@@ -145,7 +135,7 @@ impl Client {
     /// # });
     /// ```
     pub fn delete(&self, key: impl Into<Key>) -> Delete {
-        Delete::new(self.rpc(), DeleteInner::new(key.into()))
+        Delete::new(self.rpc(), key.into())
     }
 
     /// Create a new [`BatchDelete`](BatchDelete) request.
@@ -165,10 +155,7 @@ impl Client {
     /// # });
     /// ```
     pub fn batch_delete(&self, keys: impl IntoIterator<Item = impl Into<Key>>) -> BatchDelete {
-        BatchDelete::new(
-            self.rpc(),
-            BatchDeleteInner::new(keys.into_iter().map(Into::into).collect()),
-        )
+        BatchDelete::new(self.rpc(), keys.into_iter().map(Into::into).collect())
     }
 
     /// Create a new [`Scan`](Scan) request.
@@ -188,7 +175,7 @@ impl Client {
     /// # });
     /// ```
     pub fn scan(&self, range: impl Into<BoundRange>, limit: u32) -> Scan {
-        Scan::new(self.rpc(), ScanInner::new(range.into(), limit))
+        Scan::new(self.rpc(), range.into(), limit)
     }
 
     /// Create a new [`BatchScan`](BatchScan) request.
@@ -216,10 +203,8 @@ impl Client {
     ) -> BatchScan {
         BatchScan::new(
             self.rpc(),
-            BatchScanInner::new(
-                ranges.into_iter().map(KeyRange::into).collect(),
-                each_limit,
-            ),
+            ranges.into_iter().map(Into::into).collect(),
+            each_limit,
         )
     }
 
@@ -240,7 +225,7 @@ impl Client {
     /// # });
     /// ```
     pub fn delete_range(&self, range: impl Into<BoundRange>) -> DeleteRange {
-        DeleteRange::new(self.rpc(), DeleteRangeInner::new(range.into()))
+        DeleteRange::new(self.rpc(), range.into())
     }
 }
 

src/raw/mod.rs

@@ -15,7 +15,6 @@ pub use self::requests::{
     BatchDelete, BatchGet, BatchPut, BatchScan, Delete, DeleteRange, Get, Put, Scan,
 };
 
-
 use std::fmt;
 
 mod client;

src/raw/requests.rs

@@ -1,10 +1,10 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use super::ColumnFamily;
-use crate::{rpc::RpcClient, Error, Key, BoundRange, KvPair, Result, Value};
+use crate::{rpc::RpcClient, BoundRange, Error, Key, KvPair, Result, Value};
 use futures::prelude::*;
 use futures::task::{Context, Poll};
-use std::{ops::Bound, pin::Pin, sync::Arc, u32};
+use std::{pin::Pin, sync::Arc, u32};
 
 const MAX_RAW_KV_SCAN_LIMIT: u32 = 10240;
 
@@ -82,9 +82,9 @@ pub struct Get {
 }
 
 impl Get {
-    pub fn new(client: Arc<RpcClient>, inner: GetInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, key: Key) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, GetInner { key }),
         }
     }
 
@@ -103,16 +103,10 @@ impl Future for Get {
     }
 }
 
-pub struct GetInner {
+struct GetInner {
     key: Key,
 }
 
-impl GetInner {
-    pub fn new(key: Key) -> Self {
-        GetInner { key }
-    }
-}
-
 impl RequestInner for GetInner {
     type Resp = Option<Value>;
 
@@ -134,9 +128,9 @@ pub struct BatchGet {
 }
 
 impl BatchGet {
-    pub fn new(client: Arc<RpcClient>, inner: BatchGetInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, keys: Vec<Key>) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, BatchGetInner { keys }),
         }
     }
 
@@ -155,7 +149,7 @@ impl Future for BatchGet {
     }
 }
 
-pub struct BatchGetInner {
+struct BatchGetInner {
     keys: Vec<Key>,
 }
 
@@ -171,12 +165,6 @@ impl RequestInner for BatchGetInner {
     }
 }
 
-impl BatchGetInner {
-    pub fn new(keys: Vec<Key>) -> Self {
-        BatchGetInner { keys }
-    }
-}
-
 /// An unresolved [`Client::put`](Client::put) request.
 ///
 /// Once resolved this request will result in the putting of the value associated with the given
@@ -186,9 +174,9 @@ pub struct Put {
 }
 
 impl Put {
-    pub fn new(client: Arc<RpcClient>, inner: PutInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, key: Key, value: Value) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, PutInner { key, value }),
         }
     }
 
@@ -207,17 +195,11 @@ impl Future for Put {
     }
 }
 
-pub struct PutInner {
+struct PutInner {
     key: Key,
     value: Value,
 }
 
-impl PutInner {
-    pub fn new(key: Key, value: Value) -> Self {
-        PutInner { key, value }
-    }
-}
-
 impl RequestInner for PutInner {
     type Resp = ();
 
@@ -235,9 +217,9 @@ pub struct BatchPut {
 }
 
 impl BatchPut {
-    pub fn new(client: Arc<RpcClient>, inner: BatchPutInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, pairs: Vec<KvPair>) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, BatchPutInner { pairs }),
         }
     }
 
@@ -256,16 +238,10 @@ impl Future for BatchPut {
     }
 }
 
-pub struct BatchPutInner {
+struct BatchPutInner {
     pairs: Vec<KvPair>,
 }
 
-impl BatchPutInner {
-    pub fn new(pairs: Vec<KvPair>) -> Self {
-        BatchPutInner { pairs }
-    }
-}
-
 impl RequestInner for BatchPutInner {
     type Resp = ();
 
@@ -282,9 +258,9 @@ pub struct Delete {
 }
 
 impl Delete {
-    pub fn new(client: Arc<RpcClient>, inner: DeleteInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, key: Key) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, DeleteInner { key }),
         }
     }
 
@@ -303,16 +279,10 @@ impl Future for Delete {
     }
 }
 
-pub struct DeleteInner {
+struct DeleteInner {
     key: Key,
 }
 
-impl DeleteInner {
-    pub fn new(key: Key) -> Self {
-        DeleteInner { key }
-    }
-}
-
 impl RequestInner for DeleteInner {
     type Resp = ();
 
@@ -329,9 +299,9 @@ pub struct BatchDelete {
 }
 
 impl BatchDelete {
-    pub fn new(client: Arc<RpcClient>, inner: BatchDeleteInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, keys: Vec<Key>) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, BatchDeleteInner { keys }),
         }
     }
 
@@ -350,16 +320,10 @@ impl Future for BatchDelete {
     }
 }
 
-pub struct BatchDeleteInner {
+struct BatchDeleteInner {
     keys: Vec<Key>,
 }
 
-impl BatchDeleteInner {
-    pub fn new(keys: Vec<Key>) -> Self {
-        BatchDeleteInner { keys }
-    }
-}
-
 impl RequestInner for BatchDeleteInner {
     type Resp = ();
 
@@ -376,9 +340,9 @@ pub struct Scan {
 }
 
 impl Scan {
-    pub fn new(client: Arc<RpcClient>, inner: ScanInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, range: BoundRange, limit: u32) -> Self {
         Scan {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, ScanInner::new(range, limit)),
         }
     }
 
@@ -404,14 +368,14 @@ impl Future for Scan {
     }
 }
 
-pub struct ScanInner {
+struct ScanInner {
     range: BoundRange,
     limit: u32,
     key_only: bool,
 }
 
 impl ScanInner {
-    pub fn new(range: BoundRange, limit: u32) -> Self {
+    fn new(range: BoundRange, limit: u32) -> Self {
         ScanInner {
             range,
             limit,
@@ -447,9 +411,9 @@ pub struct BatchScan {
 }
 
 impl BatchScan {
-    pub fn new(client: Arc<RpcClient>, inner: BatchScanInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, ranges: Vec<BoundRange>, each_limit: u32) -> Self {
         BatchScan {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, BatchScanInner::new(ranges, each_limit)),
         }
     }
 
@@ -475,14 +439,14 @@ impl Future for BatchScan {
     }
 }
 
-pub struct BatchScanInner {
+struct BatchScanInner {
     ranges: Vec<BoundRange>,
     each_limit: u32,
     key_only: bool,
 }
 
 impl BatchScanInner {
-    pub fn new(ranges: Vec<BoundRange>, each_limit: u32) -> Self {
+    fn new(ranges: Vec<BoundRange>, each_limit: u32) -> Self {
         BatchScanInner {
             ranges,
             each_limit,
@@ -519,9 +483,9 @@ pub struct DeleteRange {
 }
 
 impl DeleteRange {
-    pub fn new(client: Arc<RpcClient>, inner: DeleteRangeInner) -> Self {
+    pub fn new(client: Arc<RpcClient>, range: BoundRange) -> Self {
         Self {
-            state: RequestState::new(client, inner),
+            state: RequestState::new(client, DeleteRangeInner { range }),
         }
     }
 
@@ -544,12 +508,6 @@ pub struct DeleteRangeInner {
     range: BoundRange,
 }
 
-impl DeleteRangeInner {
-    pub fn new(range: BoundRange) -> Self {
-        DeleteRangeInner { range }
-    }
-}
-
 impl RequestInner for DeleteRangeInner {
     type Resp = ();