Skip to content

Commit 1baa3f8

Browse files
committed
polish
Signed-off-by: Ping Yu <[email protected]>
1 parent b38ba7a commit 1baa3f8

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/timestamp.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ impl TimestampExt for Timestamp {
3535
Self {
3636
physical: version >> PHYSICAL_SHIFT_BITS,
3737
logical: version & LOGICAL_MASK,
38-
// Now we only support global transactions
39-
suffix_bits: 0,
38+
// Now we only support global transactions:
39+
// suffix_bits: 0,
40+
..Default::default()
4041
}
4142
}
4243

src/transaction/lock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ mod tests {
436436
|_: &dyn Any| {
437437
fail::fail_point!("region-error", |_| {
438438
let resp = kvrpcpb::ResolveLockResponse {
439-
region_error: Some(errorpb::Error::default()),
439+
region_error: Some(errorpb::Error::default()).into(),
440440
..Default::default()
441441
};
442442
Ok(Box::new(resp) as Box<dyn Any>)

src/transaction/requests.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ impl HasLocks for kvrpcpb::PrewriteResponse {
783783
}
784784

785785
#[cfg(test)]
786+
#[cfg_attr(feature = "protobuf-codec", allow(clippy::useless_conversion))]
786787
mod tests {
787788
use crate::{
788789
request::{plan::Merge, CollectWithShard, ResponseWithShard},
@@ -815,26 +816,26 @@ mod tests {
815816
..Default::default()
816817
},
817818
vec![kvrpcpb::Mutation {
818-
op: kvrpcpb::Op::PessimisticLock as i32,
819+
op: kvrpcpb::Op::PessimisticLock.into(),
819820
key: key2.to_vec(),
820821
..Default::default()
821822
}],
822823
);
823824

824825
let resp_not_found = ResponseWithShard(
825826
kvrpcpb::PessimisticLockResponse {
826-
values: vec![value_empty.to_vec(), value4.to_vec()],
827+
values: vec![value_empty.to_vec(), value4.to_vec()].into(),
827828
not_founds: vec![true, false],
828829
..Default::default()
829830
},
830831
vec![
831832
kvrpcpb::Mutation {
832-
op: kvrpcpb::Op::PessimisticLock as i32,
833+
op: kvrpcpb::Op::PessimisticLock.into(),
833834
key: key3.to_vec(),
834835
..Default::default()
835836
},
836837
kvrpcpb::Mutation {
837-
op: kvrpcpb::Op::PessimisticLock as i32,
838+
op: kvrpcpb::Op::PessimisticLock.into(),
838839
key: key4.to_vec(),
839840
..Default::default()
840841
},

0 commit comments

Comments
 (0)