Skip to content

Commit 5efbc12

Browse files
committed
make check
Signed-off-by: iosmanthus <[email protected]>
1 parent a5f326f commit 5efbc12

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

src/raw/requests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
22

3-
use std::{any::Any, borrow::Cow, ops::Range, sync::Arc};
3+
use std::{any::Any, ops::Range, sync::Arc};
44

55
use async_trait::async_trait;
66
use futures::stream::BoxStream;

src/request/codec.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
4949
}
5050

5151
fn decode_keys(&self, keys: Vec<Vec<u8>>) -> Result<Vec<Vec<u8>>> {
52-
Ok(keys
53-
.into_iter()
52+
keys.into_iter()
5453
.map(|key| self.decode_key(key))
55-
.collect::<Result<Vec<Vec<u8>>>>()?)
54+
.collect::<Result<Vec<Vec<u8>>>>()
5655
}
5756

5857
fn decode_pairs(&self, mut pairs: Vec<kvrpcpb::KvPair>) -> Result<Vec<kvrpcpb::KvPair>> {
@@ -167,16 +166,15 @@ impl From<KeySpaceCodec> for Prefix {
167166

168167
impl RequestCodec for KeySpaceCodec {
169168
fn encode_key(&self, mut key: Vec<u8>) -> Vec<u8> {
170-
let this = self.clone();
171169
let mut encoded = Vec::with_capacity(key.len() + KEYSPACE_PREFIX_LEN);
172-
let prefix: Prefix = this.into();
170+
let prefix: Prefix = (*self).into();
173171
encoded.extend_from_slice(&prefix);
174172
encoded.append(&mut key);
175173
encoded
176174
}
177175

178176
fn decode_key(&self, mut key: Vec<u8>) -> Result<Vec<u8>> {
179-
let prefix: Prefix = self.clone().into();
177+
let prefix: Prefix = (*self).into();
180178

181179
if !key.starts_with(&prefix) {
182180
return Err(Error::CorruptedKeyspace {

src/request/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
22

3-
use std::borrow::Cow;
4-
53
use async_trait::async_trait;
64
use derive_new::new;
75

@@ -35,7 +33,7 @@ pub trait KvRequest<C>: Request + Sized + Clone + Sync + Send + 'static {
3533
type Response: HasKeyErrors + HasLocks + HasRegionError + Clone + Send + 'static;
3634

3735
fn encode_request(self, _codec: &C) -> Self {
38-
self.clone()
36+
self
3937
}
4038

4139
fn decode_response(&self, _codec: &C, resp: Self::Response) -> crate::Result<Self::Response> {
@@ -80,7 +78,7 @@ macro_rules! impl_kv_request_for_batch_get {
8078
&self,
8179
codec: &C,
8280
mut resp: Self::Response,
83-
) -> crate::Result<Self::Response> {
81+
) -> $crate::Result<Self::Response> {
8482
*resp.mut_pairs() = codec.decode_pairs(resp.take_pairs())?;
8583

8684
Ok(resp)
@@ -112,7 +110,7 @@ macro_rules! impl_kv_request_for_scan_op {
112110
&self,
113111
codec: &C,
114112
mut resp: Self::Response,
115-
) -> crate::Result<Self::Response> {
113+
) -> $crate::Result<Self::Response> {
116114
paste::paste! {
117115
let pairs = resp.[<take_ $pairs>]();
118116

src/transaction/requests.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
2-
use std::{borrow::Cow, collections::HashMap, iter, sync::Arc};
2+
use std::{collections::HashMap, iter, sync::Arc};
33

44
use either::Either;
55
use futures::stream::BoxStream;
@@ -9,7 +9,6 @@ use tikv_client_proto::{
99
kvrpcpb::{self, TxnHeartBeatResponse},
1010
pdpb::Timestamp,
1111
};
12-
use tikv_client_store::Request;
1312

1413
use crate::{
1514
collect_first,
@@ -21,7 +20,6 @@ use crate::{
2120
store::{store_stream_for_keys, store_stream_for_range_by_start_key, RegionStore},
2221
timestamp::TimestampExt,
2322
transaction::HasLocks,
24-
transaction_lowering::PessimisticLock,
2523
util::iter::FlatMapOkIterExt,
2624
Key, KvPair, Result, Value,
2725
};

0 commit comments

Comments
 (0)