chore: standardise dependencies

Author: Tony Samuels

CONTRIBUTING.md

@@ -15,6 +15,20 @@ Should you wish to work on an issue, please claim it first by commenting on
 the GitHub issue that you want to work on it. This is to prevent duplicated
 efforts from contributors on the same issue.
 
+## Adding new dependencies
+
+### Pre-1.0 releases
+
+When adding a new 0.X release, in order to avoid ambiguity as the dependency adds new versions, ensure the version is included in the feature name. e.g. 
+
+```toml
+[dependencies]
+rand-0_9 = { default-features = false, optional = true, package = "rand", version = "0.9" }
+
+[features]
+rand-0_9 = ["dep:rand-0_9"]
+```
+
 ## Pull Request Checklist
 
 - Branch from the master branch and, if needed, rebase to the current master

Cargo.toml

@@ -19,39 +19,39 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-arbitrary = { default-features = false, optional = true, version = "1.0" }
+arbitrary = { default-features = false, optional = true, version = "1" }
 arrayvec = { default-features = false, version = "0.7" }
-borsh = { default-features = false, features = ["derive", "unstable__schema"], optional = true, version = "1.1.1" }
-bytes = { default-features = false, optional = true, version = "1.0" }
-diesel = { default-features = false, optional = true, version = "2.2.3" }
-ndarray = { default-features = false, optional = true, version = "0.15.6" }
-num-traits = { default-features = false, features = ["i128"], version = "0.2" }
-postgres-types = { default-features = false, optional = true, version = "0.2" }
+borsh = { default-features = false, features = ["derive", "unstable__schema"], optional = true, version = "1" }
+bytes = { default-features = false, optional = true, version = "1" }
+diesel = { default-features = false, optional = true, version = "2" }
+ndarray-0_16 = { default-features = false, optional = true, package = "ndarray", version = "0.16" }
+num-traits = { default-features = false, features = ["i128"], package = "num-traits", version = "0.2" }
+postgres-types = { default-features = false, optional = true, package = "postgres-types", version = "0.2" }
 proptest = { default-features = false, optional = true, features = ["std"], version = "1.0" }
 rand-0_9 = { default-features = false, optional = true, package = "rand", version = "0.9" }
+rocket = { default-features = false, optional = true, version = "0.5" }
 rust_decimal_macros = { path = "macros", default-features = false, optional = true, version = "1" }
-rkyv = { default-features = false, features = ["size_32", "std"], optional = true, version = "0.7.42" }
-rocket = { default-features = false, optional = true, version = "0.5.0-rc.3" }
-serde = { default-features = false, optional = true, version = "1.0" }
-serde_json = { default-features = false, optional = true, version = "1.0" }
-tokio-postgres = { default-features = false, optional = true, version = "0.7" }
+serde = { default-features = false, optional = true, version = "1" }
+serde_json = { default-features = false, optional = true, version = "1" }
 
 [dev-dependencies]
-bincode = { default-features = false, version = "1.0" }
-bytes = { default-features = false, version = "1.0" }
+bincode = { default-features = false, version = "1" }
+bytes = { default-features = false, version = "1" }
 criterion = { default-features = false, version = "0.5" }
 csv = "1"
-diesel = { default-features = false, features = ["mysql"], version = "2.2.3" }
+diesel = { default-features = false, features = ["mysql"], version = "2" }
 futures = { default-features = false, version = "0.3" }
+postgres = { default-features = false, version = "0.19" }
 rand-0_9 = { default-features = false, features = ["thread_rng"], package = "rand", version = "0.9" }
 rkyv-0_8 = { version = "0.8", package = "rkyv" }
-rust_decimal_macros = { path = "macros" }
 serde = { default-features = false, features = ["derive"], version = "1.0" }
 serde_json = "1.0"
-tokio = { default-features = false, features = ["macros", "rt-multi-thread", "test-util"], version = "1.0" }
-version-sync = { default-features = false, features = ["html_root_url_updated", "markdown_deps_updated"], version = "0.9" }
-postgres = { default-features = false, version = "0.19" }
+tokio = { default-features = false, features = ["macros", "rt-multi-thread", "test-util"], version = "1" }
 tokio-postgres = { default-features = false, version = "0.7" }
+version-sync = { default-features = false, features = ["html_root_url_updated", "markdown_deps_updated"], version = "0.9" }
+
+# Enable features for testing
+rust_decimal = { path = ".", features = ["rand-0_9", "macros", "rocket-0_5-traits"] }
 
 [features]
 default = ["serde", "std"]
@@ -67,12 +67,10 @@ db-tokio-postgres = ["dep:bytes", "dep:postgres-types", "std"]
 macros = ["dep:rust_decimal_macros"]
 maths = []
 maths-nopanic = ["maths"]
-ndarray = ["dep:ndarray"]
+ndarray-0_16 = ["dep:ndarray-0_16"]
 proptest = ["dep:proptest"]
 rand-0_9 = ["dep:rand-0_9"]
-rkyv = ["dep:rkyv"]
-rkyv-safe = ["rkyv/validation"]
-rocket-traits = ["dep:rocket", "std"]
+rocket-0_5-traits = ["dep:rocket", "std"]
 rust-fuzz = ["dep:arbitrary"]
 serde = ["dep:serde"]
 serde-arbitrary-precision = ["serde-with-arbitrary-precision"]
@@ -82,7 +80,7 @@ serde-str = ["serde-with-str"]
 serde-with-arbitrary-precision = ["serde", "serde_json/arbitrary_precision", "serde_json/std"]
 serde-with-float = ["serde"]
 serde-with-str = ["serde"]
-std = ["arrayvec/std", "borsh?/std", "bytes?/std", "rand-0_9?/std", "rkyv?/std", "serde?/std", "serde_json?/std"]
+std = ["arrayvec/std", "borsh?/std", "bytes?/std", "rand-0_9?/std", "serde?/std", "serde_json?/std"]
 tokio-pg = ["db-tokio-postgres"] # Backwards compatability
 
 [[bench]]

benches/lib_benches.rs

@@ -210,7 +210,7 @@ fn decimal_to_string(b: &mut test::Bencher) {
     })
 }
 
-#[cfg(feature = "postgres")]
+#[cfg(feature = "db-postgres")]
 #[bench]
 fn to_from_sql(b: &mut ::test::Bencher) {
     use bytes::BytesMut;

make/tests/misc.toml

@@ -4,7 +4,6 @@ dependencies = [
     "test-rust-fuzz",
     "test-rocket-traits",
     "test-borsh",
-    "test-rkyv",
     "test-rand"
 ]
 
@@ -18,19 +17,15 @@ args = ["test", "--workspace", "--no-default-features", "--features=rust-fuzz",
 
 [tasks.test-rocket-traits]
 command = "cargo"
-args = ["test", "--workspace", "--features=rocket-traits", "rocket_tests"]
+args = ["test", "--workspace", "--features=rocket-0_5-traits", "rocket_tests"]
 
 [tasks.test-borsh]
 command = "cargo"
 args = ["test", "--workspace", "--features=borsh", "borsh_tests", "--", "--skip", "generated"]
 
 [tasks.test-ndarray]
 command = "cargo"
-args = ["test", "--workspace", "--features=ndarray", "nd_array_tests", "--", "--skip", "generated"]
-
-[tasks.test-rkyv]
-command = "cargo"
-args = ["test", "--workspace", "--features=rkyv", "--features=rkyv-safe", "rkyv_tests", "--", "--skip", "generated"]
+args = ["test", "--workspace", "--features=ndarray-0_16", "nd_array_tests", "--", "--skip", "generated"]
 
 [tasks.test-rand]
 dependencies = [

src/decimal.rs

@@ -21,8 +21,6 @@ use diesel::{deserialize::FromSqlRow, expression::AsExpression, sql_types::Numer
 #[cfg(not(feature = "std"))]
 use num_traits::float::FloatCore;
 use num_traits::{FromPrimitive, Num, One, Signed, ToPrimitive, Zero};
-#[cfg(feature = "rkyv")]
-use rkyv::{Archive, Deserialize, Serialize};
 
 /// The smallest value that can be represented by this decimal type.
 const MIN: Decimal = Decimal {
@@ -105,13 +103,6 @@ pub struct UnpackedDecimal {
     feature = "borsh",
     derive(borsh::BorshDeserialize, borsh::BorshSerialize, borsh::BorshSchema)
 )]
-#[cfg_attr(
-    feature = "rkyv",
-    derive(Archive, Deserialize, Serialize),
-    archive(compare(PartialEq)),
-    archive_attr(derive(Clone, Copy, Debug))
-)]
-#[cfg_attr(feature = "rkyv-safe", archive(check_bytes))]
 pub struct Decimal {
     // Bits 0-15: unused
     // Bits 16-23: Contains "e", a value between 0-28 that indicates the scale
@@ -125,8 +116,8 @@ pub struct Decimal {
     mid: u32,
 }
 
-#[cfg(feature = "ndarray")]
-impl ndarray::ScalarOperand for Decimal {}
+#[cfg(feature = "ndarray-0_16")]
+impl ndarray_0_16::ScalarOperand for Decimal {}
 
 /// `RoundingStrategy` represents the different rounding strategies that can be used by
 /// `round_dp_with_strategy`.

src/lib.rs

@@ -30,8 +30,8 @@ mod postgres;
 mod proptest;
 #[cfg(feature = "rand-0_9")]
 mod rand_0_9;
-#[cfg(feature = "rocket-traits")]
-mod rocket;
+#[cfg(feature = "rocket-0_5-traits")]
+mod rocket_0_5;
 #[cfg(all(
     feature = "serde",
     not(any(

src/rand_0_9.rs

@@ -128,6 +128,7 @@ fn sync_scales(mut a: Decimal, mut b: Decimal) -> (Decimal, Decimal) {
 
 #[cfg(test)]
 mod rand_tests {
+    use rand_0_9::rng;
     use std::collections::HashSet;
 
     use super::*;
@@ -140,14 +141,14 @@ mod rand_tests {
 
     #[test]
     fn has_random_decimal_instances() {
-        let mut rng = rand_0_9::rng();
+        let mut rng = rng();
         let random: [Decimal; 32] = rng.random();
         assert!(random.windows(2).any(|slice| { slice[0] != slice[1] }));
     }
 
     #[test]
     fn generates_within_range() {
-        let mut rng = rand_0_9::rng();
+        let mut rng = rng();
         for _ in 0..128 {
             let random = rng.random_range(dec!(1.00)..dec!(1.05));
             assert!(random < dec!(1.05));
@@ -157,7 +158,7 @@ mod rand_tests {
 
     #[test]
     fn generates_within_inclusive_range() {
-        let mut rng = rand_0_9::rng();
+        let mut rng = rng();
         let mut values: HashSet<Decimal> = HashSet::new();
         for _ in 0..256 {
             let random = rng.random_range(dec!(1.00)..=dec!(1.01));

src/rocket.rs renamed to src/rocket_0_5.rs

@@ -592,9 +592,10 @@ mod test {
     #[test]
     #[cfg(feature = "serde-arbitrary-precision")]
     fn deserialize_basic_decimal() {
-        let d: Decimal = serde_json::from_str("1.1234127836128763").unwrap();
+        let s = "1.1234127836128763";
+        let d: Decimal = serde_json::from_str(s).unwrap();
         // Typically, this would not work without this feature enabled due to rounding
-        assert_eq!(d.to_string(), "1.1234127836128763");
+        assert_eq!(d.to_string(), s);
     }
 
     #[test]

src/serde.rs

@@ -157,13 +157,13 @@ mod borsh_tests {
     }
 }
 
-#[cfg(feature = "ndarray")]
+#[cfg(feature = "ndarray-0_16")]
 mod ndarray_tests {
     use rust_decimal::Decimal;
 
     #[test]
     fn it_can_do_scalar_ops_in_ndarray() {
-        use ndarray::Array1;
+        use ndarray_0_16::Array1;
         use num_traits::FromPrimitive;
 
         let array_a = Array1::from(vec![
@@ -210,38 +210,6 @@ mod ndarray_tests {
     }
 }
 
-#[cfg(feature = "rkyv")]
-mod rkyv_tests {
-    use rust_decimal::Decimal;
-    use std::str::FromStr;
-
-    #[test]
-    fn it_can_serialize_deserialize_rkyv() {
-        use rkyv::Deserialize;
-        let tests = [
-            "12.3456789",
-            "5233.9008808150288439427720175",
-            "-5233.9008808150288439427720175",
-        ];
-        for test in &tests {
-            let a = Decimal::from_str(test).unwrap();
-            let bytes = rkyv::to_bytes::<_, 256>(&a).unwrap();
-
-            #[cfg(feature = "rkyv-safe")]
-            {
-                let archived = rkyv::check_archived_root::<Decimal>(&bytes[..]).unwrap();
-                assert_eq!(archived, &a);
-            }
-
-            let archived = unsafe { rkyv::archived_root::<Decimal>(&bytes[..]) };
-            assert_eq!(archived, &a);
-
-            let deserialized: Decimal = archived.deserialize(&mut rkyv::Infallible).unwrap();
-            assert_eq!(deserialized, a);
-        }
-    }
-}
-
 #[test]
 fn it_can_deserialize_unbounded_values() {
     // Mantissa for these: 19393111376951473493673267553
@@ -4656,7 +4624,7 @@ mod proptest_tests {
     }
 }
 
-#[cfg(feature = "rocket-traits")]
+#[cfg(feature = "rocket-0_5-traits")]
 #[allow(clippy::disallowed_names)]
 mod rocket_tests {
     use crate::Decimal;