Improve rustfmt config (#401)

Signed-off-by: Andy Lok <andylokandy@hotmail.com>

Author: andylokandy

examples/common/mod.rs

@@ -1,8 +1,11 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use clap::{crate_version, App, Arg};
 use std::path::PathBuf;
 
+use clap::crate_version;
+use clap::App;
+use clap::Arg;
+
 pub struct CommandArgs {
     pub pd: Vec<String>,
     pub ca: Option<PathBuf>,

examples/pessimistic.rs

@@ -2,8 +2,13 @@
 
 mod common;
 
+use tikv_client::Config;
+use tikv_client::Key;
+use tikv_client::TransactionClient as Client;
+use tikv_client::TransactionOptions;
+use tikv_client::Value;
+
 use crate::common::parse_args;
-use tikv_client::{Config, Key, TransactionClient as Client, TransactionOptions, Value};
 
 #[tokio::main]
 async fn main() {

examples/raw.rs

@@ -4,8 +4,15 @@
 
 mod common;
 
+use tikv_client::Config;
+use tikv_client::IntoOwnedRange;
+use tikv_client::Key;
+use tikv_client::KvPair;
+use tikv_client::RawClient as Client;
+use tikv_client::Result;
+use tikv_client::Value;
+
 use crate::common::parse_args;
-use tikv_client::{Config, IntoOwnedRange, Key, KvPair, RawClient as Client, Result, Value};
 
 const KEY: &str = "TiKV";
 const VALUE: &str = "Rust";
@@ -93,10 +100,10 @@ async fn main() -> Result<()> {
         .expect("Could not scan");
 
     let keys: Vec<_> = pairs.into_iter().map(|p| p.key().clone()).collect();
-    assert_eq!(
-        &keys,
-        &[Key::from("k1".to_owned()), Key::from("k2".to_owned()),]
-    );
+    assert_eq!(&keys, &[
+        Key::from("k1".to_owned()),
+        Key::from("k2".to_owned()),
+    ]);
     println!("Scanning from {start:?} to {end:?} gives: {keys:?}");
 
     let k1 = "k1";
@@ -115,18 +122,15 @@ async fn main() -> Result<()> {
         .into_iter()
         .map(|p| String::from_utf8(p.1).unwrap())
         .collect();
-    assert_eq!(
-        &vals,
-        &[
-            "v1".to_owned(),
-            "v2".to_owned(),
-            "v2".to_owned(),
-            "v3".to_owned(),
-            "v1".to_owned(),
-            "v2".to_owned(),
-            "v3".to_owned()
-        ]
-    );
+    assert_eq!(&vals, &[
+        "v1".to_owned(),
+        "v2".to_owned(),
+        "v2".to_owned(),
+        "v3".to_owned(),
+        "v1".to_owned(),
+        "v2".to_owned(),
+        "v3".to_owned()
+    ]);
     println!("Scanning batch scan from {batch_scan_keys:?} gives: {vals:?}");
 
     // Cleanly exit.

examples/transaction.rs

@@ -2,8 +2,14 @@
 
 mod common;
 
+use tikv_client::BoundRange;
+use tikv_client::Config;
+use tikv_client::Key;
+use tikv_client::KvPair;
+use tikv_client::TransactionClient as Client;
+use tikv_client::Value;
+
 use crate::common::parse_args;
-use tikv_client::{BoundRange, Config, Key, KvPair, TransactionClient as Client, Value};
 
 async fn puts(client: &Client, pairs: impl IntoIterator<Item = impl Into<KvPair>>) {
     let mut txn = client
@@ -104,10 +110,10 @@ async fn main() {
     let key1_exists = key_exists(&txn, key1.clone()).await;
     let key2: Key = b"key_not_exist".to_vec().into();
     let key2_exists = key_exists(&txn, key2.clone()).await;
-    println!(
-        "check exists {:?}",
-        vec![(key1, key1_exists), (key2, key2_exists)]
-    );
+    println!("check exists {:?}", vec![
+        (key1, key1_exists),
+        (key2, key2_exists)
+    ]);
 
     // scan
     let key1: Key = b"key1".to_vec().into();

rustfmt.toml

@@ -1,3 +1,10 @@
-imports_granularity="Crate"
+edition = "2021"
+version = "Two"
+reorder_imports = true
+imports_granularity = "Item"
+group_imports = "StdExternalCrate"
+where_single_line = true
+trailing_comma = "Vertical"
+overflow_delimited_expr = true
 format_code_in_doc_comments = true
-edition = "2018"
+normalize_comments = true

src/backoff.rs

@@ -2,9 +2,11 @@
 
 // https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
 
-use rand::{thread_rng, Rng};
 use std::time::Duration;
 
+use rand::thread_rng;
+use rand::Rng;
+
 pub const DEFAULT_REGION_BACKOFF: Backoff = Backoff::no_jitter_backoff(2, 500, 10);
 pub const OPTIMISTIC_BACKOFF: Backoff = Backoff::no_jitter_backoff(2, 500, 10);
 pub const PESSIMISTIC_BACKOFF: Backoff = Backoff::no_jitter_backoff(2, 500, 10);
@@ -198,9 +200,10 @@ enum BackoffKind {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use std::convert::TryInto;
 
+    use super::*;
+
     #[test]
     fn test_no_jitter_backoff() {
         // Tests for zero attempts.

src/compat.rs

@@ -3,13 +3,13 @@
 //! This module contains utility types and functions for making the transition
 //! from futures 0.1 to 1.0 easier.
 
-use futures::{
-    prelude::*,
-    ready,
-    task::{Context, Poll},
-};
 use std::pin::Pin;
 
+use futures::prelude::*;
+use futures::ready;
+use futures::task::Context;
+use futures::task::Poll;
+
 /// A future implementing a tail-recursive loop.
 ///
 /// Created by the `loop_fn` function.

src/config.rs

@@ -1,7 +1,10 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use serde_derive::{Deserialize, Serialize};
-use std::{path::PathBuf, time::Duration};
+use std::path::PathBuf;
+use std::time::Duration;
+
+use serde_derive::Deserialize;
+use serde_derive::Serialize;
 
 /// The configuration for either a [`RawClient`](crate::RawClient) or a
 /// [`TransactionClient`](crate::TransactionClient).

src/kv/bound_range.rs

@@ -1,12 +1,16 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{
-    borrow::Borrow,
-    cmp::{Eq, PartialEq},
-    ops::{
-        Bound, Range, RangeBounds, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
-    },
-};
+use std::borrow::Borrow;
+use std::cmp::Eq;
+use std::cmp::PartialEq;
+use std::ops::Bound;
+use std::ops::Range;
+use std::ops::RangeBounds;
+use std::ops::RangeFrom;
+use std::ops::RangeFull;
+use std::ops::RangeInclusive;
+use std::ops::RangeTo;
+use std::ops::RangeToInclusive;
 
 #[cfg(test)]
 use proptest_derive::Arbitrary;

src/kv/codec.rs

@@ -1,4 +1,6 @@
-use std::{io::Write, ptr};
+use std::io::Write;
+use std::ptr;
+
 use tikv_client_common::internal_err;
 
 use crate::Result;
@@ -153,26 +155,18 @@ pub mod test {
     #[test]
     fn test_enc_dec_bytes() {
         let pairs = vec![
-            (
-                vec![],
-                vec![0, 0, 0, 0, 0, 0, 0, 0, 247],
-                vec![255, 255, 255, 255, 255, 255, 255, 255, 8],
-            ),
-            (
-                vec![0],
-                vec![0, 0, 0, 0, 0, 0, 0, 0, 248],
-                vec![255, 255, 255, 255, 255, 255, 255, 255, 7],
-            ),
-            (
-                vec![1, 2, 3],
-                vec![1, 2, 3, 0, 0, 0, 0, 0, 250],
-                vec![254, 253, 252, 255, 255, 255, 255, 255, 5],
-            ),
-            (
-                vec![1, 2, 3, 0],
-                vec![1, 2, 3, 0, 0, 0, 0, 0, 251],
-                vec![254, 253, 252, 255, 255, 255, 255, 255, 4],
-            ),
+            (vec![], vec![0, 0, 0, 0, 0, 0, 0, 0, 247], vec![
+                255, 255, 255, 255, 255, 255, 255, 255, 8,
+            ]),
+            (vec![0], vec![0, 0, 0, 0, 0, 0, 0, 0, 248], vec![
+                255, 255, 255, 255, 255, 255, 255, 255, 7,
+            ]),
+            (vec![1, 2, 3], vec![1, 2, 3, 0, 0, 0, 0, 0, 250], vec![
+                254, 253, 252, 255, 255, 255, 255, 255, 5,
+            ]),
+            (vec![1, 2, 3, 0], vec![1, 2, 3, 0, 0, 0, 0, 0, 251], vec![
+                254, 253, 252, 255, 255, 255, 255, 255, 4,
+            ]),
             (
                 vec![1, 2, 3, 4, 5, 6, 7],
                 vec![1, 2, 3, 4, 5, 6, 7, 0, 254],