Modernize Cargo.toml files

Collect all dependency versions and some other info in the workspace
root.

Signed-off-by: Jan Alexander Steffens (heftig) <[email protected]>

Author: heftig

Cargo.lock

@@ -1,55 +1,65 @@
 [workspace]
-members = ["synapse_auto_compressor", "compressor_integration_tests"]
+members = [
+    "synapse_auto_compressor",
+    "compressor_integration_tests",
+]
+resolver = "2"
 
-[package]
-authors = ["Erik Johnston"]
-description = "A tool to compress some state in a Synapse instance's database"
-name = "synapse_compress_state"
-version = "0.1.0"
-edition = "2018"
-
-[[bin]]
-name = "synapse_compress_state"
-required-features = ["clap"]
+[workspace.package]
+version = "0.1.4"
+edition = "2021"
 
-[dependencies]
+[workspace.dependencies]
+anyhow = "1.0.75"
+clap = { version = "4.4.2", features = ["cargo"] }
+env_logger = "0.11.2"
 indicatif = "0.17.6"
+log = "0.4.20"
+log-panics = "2.1.0"
 openssl = "0.10.72"
 postgres = "0.19.7"
 postgres-openssl = "0.5.0"
+pyo3 = { version = "0.22.4", features = ["extension-module"] }
+pyo3-log = "0.11.0"
 rand = "0.8.5"
 rayon = "1.7.0"
+serial_test = "2.0.0"
+state-map = { git = "https://github.com/matrix-org/rust-matrix-state-map", rev = "211343e" }
 string_cache = "0.8.7"
-env_logger = "0.11.2"
-log = "0.4.20"
-log-panics = "2.1.0"
+tikv-jemallocator = "0.6.0"
 
-[dependencies.state-map]
-git = "https://github.com/matrix-org/rust-matrix-state-map"
-rev = "211343e"
+[package]
+name = "synapse_compress_state"
+description = "A tool to compress some state in a Synapse instance's database"
+authors = ["Erik Johnston"]
+version.workspace = true
+edition.workspace = true
+
+[[bin]]
+name = "synapse_compress_state"
+required-features = ["clap"]
+
+[dependencies]
+clap = { workspace = true, optional = true }
+env_logger.workspace = true
+indicatif.workspace = true
+log-panics.workspace = true
+log.workspace = true
+openssl.workspace = true
+postgres-openssl.workspace = true
+postgres.workspace = true
+pyo3 = { workspace = true, optional = true }
+pyo3-log = { workspace = true, optional = true }
+rand.workspace = true
+rayon.workspace = true
+state-map.workspace = true
+string_cache.workspace = true
+tikv-jemallocator = { workspace = true, optional = true }
 
 # Needed for pyo3 support
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[dependencies.clap]
-version = "4.4.2"
-features = ["cargo"]
-optional = true
-
-[dependencies.pyo3]
-version = "0.22.4"
-features = ["extension-module"]
-optional = true
-
-[dependencies.pyo3-log]
-version = "0.11.0"
-optional = true
-
-[dependencies.tikv-jemallocator]
-version = "0.6.0"
-optional = true
-
 [features]
 default = ["clap", "jemalloc"]
 jemalloc = ["tikv-jemallocator"]

Cargo.toml

@@ -1,22 +1,25 @@
 [package]
 name = "compressor_integration_tests"
-version = "0.1.0"
-edition = "2018"
+authors = ["Azrenbeth"]
+version.workspace = true
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-string_cache = "0.8.7"
-serial_test = "2.0.0"
-openssl = "0.10.72"
-postgres = "0.19.7"
-postgres-openssl = "0.5.0"
-rand = "0.8.5"
-synapse_compress_state = { path = "../", features = ["no-progress-bars"] }
-synapse_auto_compressor = { path = "../synapse_auto_compressor/" }
-env_logger = "0.11.2"
-log = "0.4.20"
+env_logger.workspace = true
+log.workspace = true
+openssl.workspace = true
+postgres-openssl.workspace = true
+postgres.workspace = true
+rand.workspace = true
+serial_test.workspace = true
+state-map.workspace = true
+string_cache.workspace = true
 
-[dependencies.state-map]
-git = "https://github.com/matrix-org/rust-matrix-state-map"
-rev = "211343e"
+[dependencies.synapse_auto_compressor]
+path = "../synapse_auto_compressor/"
+
+[dependencies.synapse_compress_state]
+path = "../"
+features = ["no-progress-bars"]

compressor_integration_tests/Cargo.toml

@@ -1,47 +1,37 @@
 [package]
 name = "synapse_auto_compressor"
 authors = ["William Ashton"]
-version = "0.1.4"
-edition = "2018"
+version.workspace = true
+edition.workspace = true
 
 [[bin]]
 name = "synapse_auto_compressor"
 required-features = ["clap"]
 
 [dependencies]
-openssl = { version = "0.10.72", features = ["vendored"] }
-postgres = "0.19.7"
-postgres-openssl = "0.5.0"
-rand = "0.8.5"
-serial_test = "2.0.0"
-synapse_compress_state = { path = "../", features = ["no-progress-bars"], default-features = false }
-env_logger = "0.11.2"
-log = "0.4.20"
-log-panics = "2.1.0"
-anyhow = "1.0.75"
+anyhow.workspace = true
+clap = { workspace = true, optional = true }
+env_logger.workspace = true
+log-panics.workspace = true
+log.workspace = true
+openssl = { workspace = true, features = ["vendored"] }
+postgres-openssl.workspace = true
+postgres.workspace = true
+pyo3 = { workspace = true, optional = true }
+pyo3-log = { workspace = true, optional = true }
+rand.workspace = true
+serial_test.workspace = true
+tikv-jemallocator = { workspace = true, optional = true }
+
+[dependencies.synapse_compress_state]
+path = "../"
+default-features = false
+features = ["no-progress-bars"]
 
 # Needed for pyo3 support
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[dependencies.clap]
-version = "4.4.2"
-features = ["cargo"]
-optional = true
-
-[dependencies.pyo3]
-version = "0.22.4"
-features = ["extension-module"]
-optional = true
-
-[dependencies.pyo3-log]
-version = "0.11.0"
-optional = true
-
-[dependencies.tikv-jemallocator]
-version = "0.6.0"
-optional = true
-
 [features]
 default = ["clap", "jemalloc"]
 jemalloc = ["tikv-jemallocator", "synapse_compress_state/jemalloc"]