histogram: rename serde feature (#95)

Renames the serde feature to better match conventions. Version-locks metriken-derive.
pelikan-io · Jan 16, 2024 · 5b22527 · 5b22527
1 parent 08dfc84
commit 5b22527
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/histogram/Cargo.toml b/histogram/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "histogram"
-version = "0.8.4"
+version = "0.9.0"
 edition = "2021"
 authors = ["Brian Martin <brian@pelikan.io>"]
 license = "MIT OR Apache-2.0"
@@ -18,8 +18,8 @@ criterion = "0.5.1"
 rand = "0.8.5"
 
 [features]
-schemars = ["dep:schemars", "serde-serialize"]
-serde-serialize = ["serde"]
+schemars = ["dep:schemars", "serde"]
+serde = ["dep:serde"]
 
 [[bench]]
 name = "histogram"

diff --git a/histogram/src/config.rs b/histogram/src/config.rs
@@ -1,7 +1,7 @@
 use crate::Error;
 use core::ops::RangeInclusive;
 
-#[cfg(feature = "serde-serialize")]
+#[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
 /// The configuration of a histogram which determines the bucketing strategy and
@@ -56,7 +56,7 @@ use serde::{Deserialize, Serialize};
 /// * `max_value_power` must be in the range `0..=64`
 /// * `max_value_power` must be greater than `grouping_power
 #[derive(Clone, Copy, Debug, PartialEq)]
-#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Config {
     max: u64,

diff --git a/histogram/src/sparse.rs b/histogram/src/sparse.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "serde-serialize")]
+#[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
 use crate::{Bucket, Config, Error, Histogram, Snapshot};
@@ -10,7 +10,7 @@ use crate::{Bucket, Config, Error, Histogram, Snapshot};
 /// of non-zero buckets. Assuming index[0] = n, (index[0], count[0])
 /// corresponds to the nth bucket.
 #[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct SparseHistogram {
     /// parameters representing the resolution and the range of

diff --git a/metriken/Cargo.toml b/metriken/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metriken"
-version = "0.3.3"
+version = "0.4.0"
 edition = "2021"
 authors = [
 	"Brian Martin <brian@iop.systems>",
@@ -16,8 +16,8 @@ repository = "https://github.com/pelikan-io/rustcommon"
 links = "metriken"
 
 [dependencies]
-metriken-derive = { version = "0.2.0", path = "./derive" }
-histogram = { version = "0.8.3", path = "../histogram" }
+metriken-derive = { version = "=0.4.0", path = "./derive" }
+histogram = { version = "0.9.0", path = "../histogram" }
 
 linkme = "0.3.3"
 once_cell = "1.14.0"

diff --git a/metriken/derive/Cargo.toml b/metriken/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metriken-derive"
-version = "0.2.0"
+version = "0.4.0"
 edition = "2021"
 authors = [
 	"Brian Martin <brian@pelikan.io>",

diff --git a/ringlog/Cargo.toml b/ringlog/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ringlog"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Brian Martin <brian@pelikan.io>"]
@@ -11,6 +11,6 @@ repository = "https://github.com/pelikan-io/rustcommon"
 [dependencies]
 ahash = "0.8.0"
 clocksource = { version = "0.8.0", path = "../clocksource" }
-metriken = { version = "0.3.3", path = "../metriken" }
+metriken = { version = "0.4.0", path = "../metriken" }
 log = { version = "0.4.17", features = ["std"] }
 mpmc = "0.1.6"