Cleanup and test updates for bigdecimal04

schemars/Cargo.toml

@@ -64,7 +64,6 @@ indexmap1 = ["indexmap"]
 raw_value = ["serde_json/raw_value"]
 # `bigdecimal` feature without version suffix is included only for back-compat - will be removed in a later version
 bigdecimal = ["bigdecimal03"]
-bigdecimal04 = ["dep:bigdecimal04"]
 
 ui_test = []
 
@@ -126,7 +125,7 @@ required-features = ["semver"]
 
 [[test]]
 name = "decimal"
-required-features = ["rust_decimal", "bigdecimal"]
+required-features = ["rust_decimal", "bigdecimal03", "bigdecimal04"]
 
 [package.metadata.docs.rs]
 all-features = true

schemars/src/json_schema_impls/decimal.rs

@@ -33,7 +33,7 @@ macro_rules! decimal_impl {
 
 #[cfg(feature = "rust_decimal")]
 decimal_impl!(rust_decimal::Decimal);
-#[cfg(feature = "bigdecimal")]
+#[cfg(feature = "bigdecimal03")]
 decimal_impl!(bigdecimal03::BigDecimal);
 #[cfg(feature = "bigdecimal04")]
 decimal_impl!(bigdecimal04::BigDecimal);

schemars/src/json_schema_impls/mod.rs

@@ -51,7 +51,11 @@ mod bytes;
 #[cfg(feature = "chrono")]
 mod chrono;
 mod core;
-#[cfg(any(feature = "rust_decimal", feature = "bigdecimal"))]
+#[cfg(any(
+    feature = "rust_decimal",
+    feature = "bigdecimal03",
+    feature = "bigdecimal04"
+))]
 mod decimal;
 #[cfg(feature = "either")]
 mod either;

schemars/tests/decimal.rs

@@ -7,6 +7,11 @@ fn rust_decimal() -> TestResult {
 }
 
 #[test]
-fn bigdecimal() -> TestResult {
+fn bigdecimal03() -> TestResult {
-    test_default_generated_schema::<bigdecimal::BigDecimal>("bigdecimal")
+    test_default_generated_schema::<bigdecimal03::BigDecimal>("bigdecimal03")
+}
+
+#[test]
+fn bigdecimal04() -> TestResult {
+    test_default_generated_schema::<bigdecimal04::BigDecimal>("bigdecimal04")
 }

schemars/tests/expected/bigdecimal04.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Decimal",
+  "type": "string",
+  "pattern": "^-?[0-9]+(\\.[0-9]+)?$"
+}