Skip to content

Commit

Permalink
address comment
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Lok <andylokandy@hotmail.com>
  • Loading branch information
andylokandy committed Jul 8, 2023
1 parent bfba856 commit e15824f
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 28 deletions.
29 changes: 14 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ integration-tests = []
name = "tikv_client"

[dependencies]
async-recursion = "0.3"
async-trait = "0.1"
derive-new = "0.5"
either = "1.6"
Expand All @@ -32,40 +33,38 @@ semver = "1.0"
serde = "1.0"
serde_derive = "1.0"
slog = { version = "2.3", features = [
"max_level_trace",
"release_max_level_debug",
"max_level_trace",
"release_max_level_debug",
] }
slog-term = { version = "2.4" }
thiserror = "1"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }
async-recursion = "0.3"
tonic = "0.9"
tikv-client-common = { version = "0.2.0", path = "tikv-client-common" }
tikv-client-pd = { version = "0.2.0", path = "tikv-client-pd" }
tikv-client-proto = { version = "0.2.0", path = "tikv-client-proto" }
tikv-client-store = { version = "0.2.0", path = "tikv-client-store" }

tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }
tonic = "0.9"

[dev-dependencies]
clap = "2"
env_logger = "0.10"
fail = { version = "0.4", features = ["failpoints"] }
proptest = "1"
proptest-derive = "0.3"
serial_test = "0.5.0"
simple_logger = "1"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }
reqwest = { version = "0.11", default-features = false, features = [
"native-tls-vendored",
"native-tls-vendored",
] }
serde_json = "1"
env_logger = "0.10"
serial_test = "0.5.0"
simple_logger = "1"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }

[workspace]
members = [
"tikv-client-common",
"tikv-client-pd",
"tikv-client-proto",
"tikv-client-store",
"tikv-client-common",
"tikv-client-pd",
"tikv-client-proto",
"tikv-client-store",
]

[[test]]
Expand Down
36 changes: 36 additions & 0 deletions taplo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
## https://taplo.tamasfe.dev/configuration/file.html

include = ["**/Cargo.toml"]

[formatting]
# Align consecutive entries vertically.
align_entries = false
# Append trailing commas for multi-line arrays.
array_trailing_comma = true
# Expand arrays to multiple lines that exceed the maximum column width.
array_auto_expand = true
# Collapse arrays that don't exceed the maximum column width and don't contain comments.
array_auto_collapse = false
# Omit white space padding from single-line arrays
compact_arrays = true
# Omit white space padding from the start and end of inline tables.
compact_inline_tables = false
# Maximum column width in characters, affects array expansion and collapse, this doesn't take whitespace into account.
# Note that this is not set in stone, and works on a best-effort basis.
column_width = 120
# Indent based on tables and arrays of tables and their subtables, subtables out of order are not indented.
indent_tables = false
# The substring that is used for indentation, should be tabs or spaces (but technically can be anything).
indent_string = ' '
# Add trailing newline at the end of the file if not present.
trailing_newline = true
# Alphabetically reorder keys that are not separated by empty lines.
reorder_keys = false
# Maximum amount of allowed consecutive blank lines. This does not affect the whitespace at the end of the document, as it is always stripped.
allowed_blank_lines = 1
# Use CRLF for line endings.
crlf = false

[[rule]]
keys = ["dependencies", "dev-dependencies", "build-dependencies"]
formatting = { reorder_keys = true }
8 changes: 4 additions & 4 deletions tikv-client-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ repository = "https://github.com/tikv/client-rust"
description = "Common components of the TiKV Rust client"

[dependencies]
thiserror = "1"
futures = { version = "0.3", features = [
"compat",
"async-await",
"thread-pool",
"compat",
"async-await",
"thread-pool",
] }
lazy_static = "1"
log = "0.4"
regex = "1"
semver = "1"
thiserror = "1"
tikv-client-proto = { version = "0.2.0", path = "../tikv-client-proto" }
tokio = "1"
tonic = { version = "0.9", features = ["tls"] }
Expand Down
6 changes: 2 additions & 4 deletions tikv-client-pd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ description = "Low level PD components for the TiKV Rust client"
[dependencies]
async-trait = "0.1"
futures = "0.3"
# futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
log = "0.4"
pin-project = "1"
tikv-client-common = { version = "0.2.0", path = "../tikv-client-common" }
tikv-client-proto = { version = "0.2.0", path = "../tikv-client-proto" }
tonic = "0.9"
pin-project = "1"
tokio = { version = "1", features = ["sync"] }

tonic = "0.9"

[dev-dependencies]
clap = "2"
Expand Down
4 changes: 2 additions & 2 deletions tikv-client-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ description = "Protobuf specs for the TiKV Rust client"
build = "build.rs"

[build-dependencies]
tonic-build = "0.9"
glob = "0.3.1"
tonic-build = "0.9"

[dependencies]
futures = "0.3"
lazy_static = { version = "1" }
tonic = "0.9"
prost = "0.11"
tonic = "0.9"

[lib]
doctest = false
6 changes: 3 additions & 3 deletions tikv-client-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ description = "Low level TiKV node components of the TiKV Rust client"
async-trait = "0.1"
derive-new = "0.5"
futures = { version = "0.3", features = [
"compat",
"async-await",
"thread-pool",
"compat",
"async-await",
"thread-pool",
] }
log = "0.4"
tikv-client-common = { version = "0.2.0", path = "../tikv-client-common" }
Expand Down

0 comments on commit e15824f

Please sign in to comment.