Use derive(new) in a few more places

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

Author: nrc

src/kv.rs

@@ -1,5 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
+use derive_new::new;
 use std::cmp::{Eq, PartialEq};
 use std::convert::TryFrom;
 use std::ops::{Bound, Deref, DerefMut, Range, RangeFrom, RangeInclusive};
@@ -55,15 +56,10 @@ impl<'a> fmt::Display for HexRepr<'a> {
 /// **But, you should not need to worry about all this:** Many functions which accept a `Key`
 /// accept an `Into<Key>`, which means all of the above types can be passed directly to those
 /// functions.
-#[derive(Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(new, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct Key(Vec<u8>);
 
 impl Key {
-    #[inline]
-    pub fn new(value: Vec<u8>) -> Self {
-        Key(value)
-    }
-
     #[inline]
     pub(crate) fn into_inner(self) -> Vec<u8> {
         self.0
@@ -199,15 +195,10 @@ impl fmt::Debug for Key {
 /// **But, you should not need to worry about all this:** Many functions which accept a `Value`
 /// accept an `Into<Value>`, which means all of the above types can be passed directly to those
 /// functions.
-#[derive(Default, Clone, Eq, PartialEq, Hash)]
+#[derive(new, Default, Clone, Eq, PartialEq, Hash)]
 pub struct Value(Vec<u8>);
 
 impl Value {
-    #[inline]
-    pub fn new(value: Vec<u8>) -> Self {
-        Value(value)
-    }
-
     #[inline]
     pub(crate) fn into_inner(self) -> Vec<u8> {
         self.0

src/raw/client.rs

@@ -3,6 +3,7 @@
 use super::ColumnFamily;
 use crate::{rpc::RpcClient, BoundRange, Config, Error, Key, KvPair, Result, Value};
 
+use derive_new::new;
 use futures::future::Either;
 use futures::prelude::*;
 use futures::task::{Context, Poll};
@@ -356,16 +357,11 @@ impl Client {
 /// let client: Client = connect.await.unwrap();
 /// # });
 /// ```
+#[derive(new)]
 pub struct Connect {
     config: Config,
 }
 
-impl Connect {
-    fn new(config: Config) -> Self {
-        Connect { config }
-    }
-}
-
 impl Future for Connect {
     type Output = Result<Client>;
 

src/rpc/pd/mod.rs

@@ -3,6 +3,7 @@
 // TODO: Remove this when txn is done.
 #![allow(dead_code)]
 
+use derive_new::new;
 pub use kvproto::metapb::{Peer, Store};
 use kvproto::{kvrpcpb, metapb};
 
@@ -25,17 +26,13 @@ pub struct RegionVerId {
     pub ver: u64,
 }
 
-#[derive(Clone, Default, Debug, PartialEq)]
+#[derive(new, Clone, Default, Debug, PartialEq)]
 pub struct Region {
     pub region: metapb::Region,
     pub leader: Option<Peer>,
 }
 
 impl Region {
-    pub fn new(region: metapb::Region, leader: Option<metapb::Peer>) -> Self {
-        Region { region, leader }
-    }
-
     pub fn switch_peer(&mut self, _to: StoreId) -> Result<()> {
         unimplemented!()
     }

src/transaction/client.rs

@@ -3,6 +3,7 @@
 use super::{Snapshot, Timestamp, Transaction};
 use crate::{Config, Error};
 
+use derive_new::new;
 use futures::prelude::*;
 use futures::task::{Context, Poll};
 use std::pin::Pin;
@@ -115,16 +116,11 @@ impl Client {
 /// let client: Client = connect.await.unwrap();
 /// # });
 /// ```
+#[derive(new)]
 pub struct Connect {
     config: Config,
 }
 
-impl Connect {
-    fn new(config: Config) -> Self {
-        Connect { config }
-    }
-}
-
 impl Future for Connect {
     type Output = Result<Client, Error>;
 

src/transaction/requests.rs

@@ -3,6 +3,7 @@
 use super::Transaction;
 use crate::{Error, Key, KvPair, Value};
 
+use derive_new::new;
 use futures::prelude::*;
 use futures::task::{Context, Poll};
 use std::pin::Pin;
@@ -24,16 +25,11 @@ impl Stream for Scanner {
 ///
 /// Once resolved this request will result in the fetching of the value associated with the given
 /// key.
+#[derive(new)]
 pub struct Get {
     key: Key,
 }
 
-impl Get {
-    pub fn new(key: Key) -> Self {
-        Get { key }
-    }
-}
-
 impl Future for Get {
     type Output = Result<Value, Error>;
 
@@ -47,16 +43,11 @@ impl Future for Get {
 ///
 /// Once resolved this request will result in the fetching of the values associated with the given
 /// keys.
+#[derive(new)]
 pub struct BatchGet {
     keys: Vec<Key>,
 }
 
-impl BatchGet {
-    pub fn new(keys: Vec<Key>) -> Self {
-        BatchGet { keys }
-    }
-}
-
 impl Future for BatchGet {
     type Output = Result<Vec<KvPair>, Error>;
 
@@ -69,16 +60,11 @@ impl Future for BatchGet {
 /// An unresolved [`Transaction::commit`](Transaction::commit) request.
 ///
 /// Once resolved this request will result in the committing of the transaction.
+#[derive(new)]
 pub struct Commit {
     txn: Transaction,
 }
 
-impl Commit {
-    pub fn new(txn: Transaction) -> Self {
-        Commit { txn }
-    }
-}
-
 impl Future for Commit {
     type Output = Result<(), Error>;
 
@@ -91,16 +77,11 @@ impl Future for Commit {
 /// An unresolved [`Transaction::rollback`](Transaction::rollback) request.
 ///
 /// Once resolved this request will result in the rolling back of the transaction.
+#[derive(new)]
 pub struct Rollback {
     txn: Transaction,
 }
 
-impl Rollback {
-    pub fn new(txn: Transaction) -> Self {
-        Rollback { txn }
-    }
-}
-
 impl Future for Rollback {
     type Output = Result<(), Error>;
 
@@ -113,16 +94,11 @@ impl Future for Rollback {
 /// An unresolved [`Transaction::lock_keys`](Transaction::lock_keys) request.
 ///
 /// Once resolved this request will result in the locking of the given keys.
+#[derive(new)]
 pub struct LockKeys {
     keys: Vec<Key>,
 }
 
-impl LockKeys {
-    pub fn new(keys: Vec<Key>) -> Self {
-        LockKeys { keys }
-    }
-}
-
 impl Future for LockKeys {
     type Output = Result<(), Error>;
 
@@ -136,17 +112,12 @@ impl Future for LockKeys {
 ///
 /// Once resolved this request will result in the setting of the value associated with the given
 /// key.
+#[derive(new)]
 pub struct Set {
     key: Key,
     value: Value,
 }
 
-impl Set {
-    pub fn new(key: Key, value: Value) -> Self {
-        Set { key, value }
-    }
-}
-
 impl Future for Set {
     type Output = Result<(), Error>;
 
@@ -160,16 +131,11 @@ impl Future for Set {
 /// An unresolved [`Transaction::delete`](Transaction::delete) request.
 ///
 /// Once resolved this request will result in the deletion of the given key.
+#[derive(new)]
 pub struct Delete {
     key: Key,
 }
 
-impl Delete {
-    pub fn new(key: Key) -> Self {
-        Delete { key }
-    }
-}
-
 impl Future for Delete {
     type Output = Result<(), Error>;
 

src/transaction/transaction.rs

@@ -3,6 +3,7 @@
 use super::{BatchGet, Commit, Delete, Get, LockKeys, Rollback, Scanner, Set, Timestamp};
 use crate::{Key, Value};
 
+use derive_new::new;
 use std::ops::RangeBounds;
 
 /// A undo-able set of actions on the dataset.
@@ -11,27 +12,12 @@ use std::ops::RangeBounds;
 /// particular timestamp obtained from the placement driver.
 ///
 /// Once a transaction is commited, a new commit timestamp is obtained from the placement driver.
+#[derive(new)]
 pub struct Transaction {
     snapshot: Snapshot,
 }
 
 impl Transaction {
-    /// Create a new transaction operating on the given snapshot.
-    ///
-    /// ```rust,no_run
-    /// # #![feature(async_await)]
-    /// use tikv_client::{Config, transaction::Client};
-    /// use futures::prelude::*;
-    /// # futures::executor::block_on(async {
-    /// let connect = Client::connect(Config::default());
-    /// let client = connect.await.unwrap();
-    /// let txn = client.begin();
-    /// # });
-    /// ```
-    pub fn new(snapshot: Snapshot) -> Self {
-        Self { snapshot }
-    }
-
     /// Commit the actions of the transaction.
     ///
     /// Once committed, it is no longer possible to `rollback` the actions in the transaction.