diff --git a/Cargo.lock b/Cargo.lock index 42c5df8..f439781 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,8 +204,6 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "minisql", - "parser", "proto", "tokio", ] @@ -578,7 +576,6 @@ dependencies = [ "parser", "proto", "rand", - "serde_json", "tokio", ] @@ -647,18 +644,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -667,9 +664,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 3e6cda3..729ebaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,14 @@ members = [ "parser", "storage_engine" ] + +[workspace.dependencies] +anyhow = "1.0.79" +async-trait = "0.1.77" +bimap = "0.6.3" +bincode = "2.0.0-rc.3" +clap = "4.4.18" +rand = "0.8.5" +serde = "1.0.196" +thiserror = "1.0.56" +tokio = "1.36.0" diff --git a/client/Cargo.toml b/client/Cargo.toml index 4e060c2..fb22828 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -6,9 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.35.1", features = ["full"] } -anyhow = "1.0.76" +anyhow = { workspace = true } +clap = { workspace = true, features = ["derive"] } +tokio = { workspace = true, features = ["full"] } + proto = { path = "../proto" } -minisql = { path = "../minisql" } -parser = { path = "../parser" } -clap = { version = "4.4.18", features = ["derive"] } \ No newline at end of file diff --git a/minisql/Cargo.toml b/minisql/Cargo.toml index 4029a5c..d8eb7ea 100644 --- a/minisql/Cargo.toml +++ b/minisql/Cargo.toml @@ -7,13 +7,14 @@ rust-version = "1.74" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.79" -async-trait = "0.1.77" -bimap = { version = "0.6.3", features = ["serde"] } -bincode = "2.0.0-rc.3" -serde = { version = "1.0.196", features = ["derive", "rc"] } -tokio = { version = "1.34.0", features = ["full"] } -thiserror = "1.0.50" +anyhow = { workspace = true } +async-trait = { workspace = true } +bimap = { workspace = true, features = ["serde"] } +bincode = { workspace = true } +serde = { workspace = true, features = ["derive", "rc"] } +serde_json = "1.0.113" +thiserror = { workspace = true } +tokio = { workspace = true, features = ["full"] } + proto = { path = "../proto" } storage_engine = { path = "../storage_engine" } -serde_json = "1.0.113" diff --git a/parser/Cargo.toml b/parser/Cargo.toml index ff211a0..67c99be 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -6,8 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nom-peg = "0.1.1" +bimap = { workspace = true } nom = "7.1.3" +nom-peg = "0.1.1" +thiserror = { workspace = true } + minisql = { path = "../minisql" } -bimap = "0.6.3" -thiserror = "1" \ No newline at end of file diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 40f5991..7c95380 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -bincode = "2.0.0-rc.3" -tokio = { version = "1.34.0", features = ["io-util", "macros", "test-util"] } -async-trait = "0.1.74" -thiserror = "1.0.50" -rand_seeder = "0.2.3" +async-trait = { workspace = true } +bincode = { workspace = true } +rand = { workspace = true } rand_pcg = "0.3.1" -rand = "0.8.5" +rand_seeder = "0.2.3" +thiserror = { workspace = true } +tokio = { workspace = true, features = ["io-util", "macros", "test-util"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index 67c87d7..3747730 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.35.1", features = ["full"] } -anyhow = "1.0.76" -clap = { version = "4.4.18", features = ["derive"] } -async-trait = "0.1.74" -rand = "0.8.5" -serde_json = "1.0.112" +tokio = { workspace = true, features = ["full"] } +anyhow = { workspace = true } +clap = { workspace = true, features = ["derive"] } +async-trait = { workspace = true } +rand = { workspace = true } + minisql = { path = "../minisql" } +parser = { path = "../parser" } proto = { path = "../proto" } -parser = { path = "../parser" } \ No newline at end of file diff --git a/storage_engine/Cargo.toml b/storage_engine/Cargo.toml index 6658764..c4ec694 100644 --- a/storage_engine/Cargo.toml +++ b/storage_engine/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -bincode = "2.0.0-rc.3" -tokio = { version = "1.34.0", features = ["full"] } -async-trait = "0.1.74" -thiserror = "1.0.50" +async-trait = { workspace = true } +bincode = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["full"] }