From 09fa9829130ba7a24a19a4e758017125de847149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jind=C5=99ich=20Moravec?= Date: Mon, 5 Feb 2024 23:31:14 +0100 Subject: [PATCH] chore: cleanup tokio features --- Cargo.lock | 81 +-------------------------------------- client/Cargo.toml | 2 +- minisql/Cargo.toml | 2 +- server/Cargo.toml | 4 +- storage_engine/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f439781..a086ca9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,12 +82,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - [[package]] name = "backtrace" version = "0.3.69" @@ -131,12 +125,6 @@ dependencies = [ "virtue", ] -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bytes" version = "1.5.0" @@ -239,9 +227,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "itoa" @@ -255,16 +243,6 @@ version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "memchr" version = "2.6.4" @@ -364,29 +342,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - [[package]] name = "parser" version = "0.1.0" @@ -507,15 +462,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags", -] - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -528,12 +474,6 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" version = "1.0.196" @@ -579,21 +519,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - [[package]] name = "socket2" version = "0.5.5" @@ -673,9 +598,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", "pin-project-lite", - "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.48.0", diff --git a/client/Cargo.toml b/client/Cargo.toml index fb22828..82b49c7 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] anyhow = { workspace = true } clap = { workspace = true, features = ["derive"] } -tokio = { workspace = true, features = ["full"] } +tokio = { workspace = true, features = ["io-util", "macros", "net", "rt-multi-thread"] } proto = { path = "../proto" } diff --git a/minisql/Cargo.toml b/minisql/Cargo.toml index d8eb7ea..2879cd5 100644 --- a/minisql/Cargo.toml +++ b/minisql/Cargo.toml @@ -14,7 +14,7 @@ bincode = { workspace = true } serde = { workspace = true, features = ["derive", "rc"] } serde_json = "1.0.113" thiserror = { workspace = true } -tokio = { workspace = true, features = ["full"] } +tokio = { workspace = true, features = ["macros"] } proto = { path = "../proto" } storage_engine = { path = "../storage_engine" } diff --git a/server/Cargo.toml b/server/Cargo.toml index 3747730..00ab655 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { workspace = true, features = ["full"] } anyhow = { workspace = true } -clap = { workspace = true, features = ["derive"] } async-trait = { workspace = true } +clap = { workspace = true, features = ["derive"] } rand = { workspace = true } +tokio = { workspace = true, features = ["io-util", "macros", "net", "rt-multi-thread"] } minisql = { path = "../minisql" } parser = { path = "../parser" } diff --git a/storage_engine/Cargo.toml b/storage_engine/Cargo.toml index c4ec694..6846dd5 100644 --- a/storage_engine/Cargo.toml +++ b/storage_engine/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" async-trait = { workspace = true } bincode = { workspace = true } thiserror = { workspace = true } -tokio = { workspace = true, features = ["full"] } +tokio = { workspace = true, features = ["fs", "io-util", "macros", "rt-multi-thread"] }