Add serde and serde_json as workspace dependencies and update them

Author: Kobzol

Cargo.lock

@@ -3,6 +3,10 @@ members = ["collector", "collector/benchlib", "site", "database", "intern"]
 exclude = ["rust/src"]
 resolver = "2"
 
+[workspace.dependencies]
+serde = "1"
+serde_json = "1"
+
 [profile.release.package.site]
 debug = 1
 

Cargo.toml

@@ -12,8 +12,8 @@ env_logger = "0.10"
 anyhow = "1"
 thiserror = "1"
 log = "0.4"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 tempfile = "3"
 libc = "0.2"
 chrono = { version = "0.4", features = ["serde"] }

collector/Cargo.toml

@@ -7,9 +7,10 @@ description = "Library for defining and measuring benchmarks of Rust code"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
 anyhow = "1.0.61"
-serde = { version = "1.0.143", features = ["derive"] }
-serde_json = "1.0.83"
 log = "0.4.17"
 env_logger = "0.10.0"
 clap = { version = "4.1", features = ["derive", "string"] }

collector/benchlib/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 hashbrown = { version = "0.14", features = ["serde"] }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 rusqlite = { version = "0.28", features = ["bundled"] }
 tokio-postgres = { version = "0.7", features = ["with-chrono-0_4", "runtime"] }
 anyhow = "1"

database/Cargo.toml

@@ -10,5 +10,4 @@ parking_lot = "0.12"
 arc-swap = "1.3"
 hashbrown = "0.14"
 lazy_static = "1"
-serde = "1"
-serde_derive = "1"
+serde = { workspace = true, features = ["derive"] }

intern/Cargo.toml

@@ -187,7 +187,7 @@ pub fn intern<T: InternString>(value: &str) -> T {
     })
 }
 
-#[derive(serde_derive::Serialize, Copy, Clone, PartialEq, Eq)]
+#[derive(serde::Serialize, Copy, Clone, PartialEq, Eq)]
 #[serde(into = "&'static str")]
 pub struct ArenaStr(NonNull<u8>);
 

intern/src/lib.rs

@@ -10,9 +10,8 @@ anyhow = "1"
 futures = "0.3"
 tokio = { version = "1.26", features = ["macros", "time"] }
 log = "0.4"
-serde = { version = "1", features = ["rc"] }
-serde_derive = "1"
-serde_json = "1"
+serde = { workspace = true, features = ["rc"] }
+serde_json = { workspace = true }
 hyper = { version = "0.14", features = ["server", "stream"] }
 headers = "0.3"
 http = "0.2"
@@ -55,6 +54,6 @@ jemalloc-ctl = "0.5"
 path = "../collector"
 
 [build-dependencies]
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 toml = "0.7"