Add support for schemars v0.9 (#849)

Author: jonasbb

.github/workflows/ci.yaml

@@ -60,7 +60,7 @@ jobs:
         # It is good to test more than the MSRV and stable since sometimes
         # breakage occurs in intermediate versions.
         # IMPORTANT: Synchronize the MSRV with the Cargo.toml values.
-        rust: ["1.71", "1.75", "1.80", "1.85", "stable", "beta", "nightly"]
+        rust: ["1.74", "1.75", "1.80", "1.85", "stable", "beta", "nightly"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

Cargo.lock

@@ -11,7 +11,7 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/jonasbb/serde_with/"
-rust-version = "1.71"
+rust-version = "1.74"
 version = "3.12.0"
 
 [workspace.metadata.release]

Cargo.toml

@@ -12,11 +12,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Generalize `serde_with::rust::unwrap_or_skip` to support deserializing references by @beroal (#832)
 * Bump MSRV to 1.71, since that is required for the `jsonschema` dev-dependency.
 * Make `serde_conv` available without the `std` feature by @arilou (#839)
+* Bump MSRV to 1.74, since that is required for `schemars` v0.9.0 by @swlynch99 (#849)
 
 ### Fixed
 
 * Make the `DurationSeconds` types and other variants more accessible even without `std` (#845)
 
+### Added
+
+* Added support for `schemars` v0.9.0 under the `schemars_0_9` feature flag by @swlynch99 (#849)
+
 ## [3.12.0] - 2024-12-25
 
 ### Added

serde_with/CHANGELOG.md

@@ -41,7 +41,7 @@ alloc = ["serde/alloc", "base64?/alloc", "chrono_0_4?/alloc", "hex?/alloc", "ser
 ## Enables support for various types from the std library.
 ## This will enable `std` support in all dependencies too.
 ## The feature enabled by default and also enables `alloc`.
-std = ["alloc", "serde/std", "chrono_0_4?/clock", "chrono_0_4?/std", "indexmap_1?/std", "indexmap_2?/std", "time_0_3?/serde-well-known", "time_0_3?/std"]
+std = ["alloc", "serde/std", "chrono_0_4?/clock", "chrono_0_4?/std", "indexmap_1?/std", "indexmap_2?/std", "time_0_3?/serde-well-known", "time_0_3?/std", "schemars_0_9?/std"]
 
 #! # Documentation
 #!
@@ -118,6 +118,13 @@ macros = ["dep:serde_with_macros"]
 ## This pulls in `schemars` v0.8 as a dependency. It will also implicitly enable
 ## the `std` feature as `schemars` is not `#[no_std]`.
 schemars_0_8 = ["dep:schemars_0_8", "std", "serde_with_macros?/schemars_0_8"]
+## This feature enables integration with `schemars` 0.9
+## This makes `#[derive(JsonSchema)]` pick up the correct schema for the type
+## used within `#[serde_as(as = ...)]`.
+##
+## This pulls in `schemars` v0.9 as a dependency. It will also implicitly enable
+## the `alloc` feature.
+schemars_0_9 = ["dep:schemars_0_9", "alloc", "serde_with_macros?/schemars_0_9", "dep:serde_json"]
 ## The feature enables integration of `time` v0.3 specific conversions.
 ## This includes support for the timestamp and duration types.
 ##
@@ -136,6 +143,7 @@ hex = { version = "0.4.3", optional = true, default-features = false }
 indexmap_1 = { package = "indexmap", version = "1.8", optional = true, default-features = false, features = ["serde-1"] }
 indexmap_2 = { package = "indexmap", version = "2.0", optional = true, default-features = false, features = ["serde"] }
 schemars_0_8 = { package = "schemars", version = "0.8.16", optional = true, default-features = false }
+schemars_0_9 = { package = "schemars", version = "0.9.0", optional = true, default-features = false }
 serde = { version = "1.0.152", default-features = false }
 serde_derive = "1.0.152"
 serde_json = { version = "1.0.45", optional = true, default-features = false }
@@ -154,6 +162,7 @@ rmp-serde = "1.3.0"
 ron = "0.10"
 rustversion = "1.0.0"
 schemars_0_8 = { package = "schemars", version = "0.8.16" }
+schemars_0_9 = { package = "schemars", version = "0.9.0" }
 serde = { version = "1.0.152", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.25", features = ["preserve_order"] }
 serde_test = "1.0.124"
@@ -231,6 +240,11 @@ name = "schemars_0_8"
 path = "tests/schemars_0_8.rs"
 required-features = ["schemars_0_8"]
 
+[[test]]
+name = "schemars_0_9"
+path = "tests/schemars_0_9/main.rs"
+required-features = ["schemars_0_9", "std"]
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = [

serde_with/Cargo.toml

@@ -312,6 +312,9 @@ pub mod rust;
 #[cfg(feature = "schemars_0_8")]
 #[cfg_attr(docsrs, doc(cfg(feature = "schemars_0_8")))]
 pub mod schemars_0_8;
+#[cfg(feature = "schemars_0_9")]
+#[cfg_attr(docsrs, doc(cfg(feature = "schemars_0_9")))]
+pub mod schemars_0_9;
 pub mod ser;
 mod serde_conv;
 #[cfg(feature = "time_0_3")]
@@ -2595,5 +2598,5 @@ pub struct SetLastValueWins<T>(PhantomData<T>);
 /// feature is enabled.
 ///
 /// [`JsonSchema`]: ::schemars_0_8::JsonSchema
-#[cfg(feature = "schemars_0_8")]
+#[cfg(any(feature = "schemars_0_8", feature = "schemars_0_9"))]
 pub struct Schema<T: ?Sized, TA>(PhantomData<T>, PhantomData<TA>);

serde_with/src/lib.rs

@@ -442,11 +442,11 @@ impl JsonSchemaAs<Vec<u8>> for BytesOrString {
         "serde_with::BytesOrString".into()
     }
 
-    fn json_schema(gen: &mut SchemaGenerator) -> Schema {
+    fn json_schema(generator: &mut SchemaGenerator) -> Schema {
         SchemaObject {
             subschemas: Some(Box::new(SubschemaValidation {
                 any_of: Some(std::vec![
-                    gen.subschema_for::<Vec<u8>>(),
+                    generator.subschema_for::<Vec<u8>>(),
                     SchemaObject {
                         instance_type: Some(InstanceType::String.into()),
                         metadata: Some(Box::new(Metadata {
@@ -607,13 +607,13 @@ where
     ///
     /// Unfortunately for us, we need to handle all of these options by recursing
     /// into the subschemas and applying the same transformations as above.
-    fn kvmap_transform_schema(gen: &mut SchemaGenerator, schema: &mut Schema) {
+    fn kvmap_transform_schema_0_8(gen: &mut SchemaGenerator, schema: &mut Schema) {
         let mut parents = Vec::new();
 
-        Self::kvmap_transform_schema_impl(gen, schema, &mut parents, 0);
+        Self::kvmap_transform_schema_impl_0_8(gen, schema, &mut parents, 0);
     }
 
-    fn kvmap_transform_schema_impl(
+    fn kvmap_transform_schema_impl_0_8(
         gen: &mut SchemaGenerator,
         schema: &mut Schema,
         parents: &mut Vec<String>,
@@ -707,19 +707,19 @@ where
 
         if let Some(one_of) = &mut subschemas.one_of {
             for subschema in one_of {
-                Self::kvmap_transform_schema_impl(gen, subschema, &mut parents, depth + 1);
+                Self::kvmap_transform_schema_impl_0_8(gen, subschema, &mut parents, depth + 1);
             }
         }
 
         if let Some(any_of) = &mut subschemas.any_of {
             for subschema in any_of {
-                Self::kvmap_transform_schema_impl(gen, subschema, &mut parents, depth + 1);
+                Self::kvmap_transform_schema_impl_0_8(gen, subschema, &mut parents, depth + 1);
             }
         }
 
         if let Some(all_of) = &mut subschemas.all_of {
             for subschema in all_of {
-                Self::kvmap_transform_schema_impl(gen, subschema, &mut parents, depth + 1);
+                Self::kvmap_transform_schema_impl_0_8(gen, subschema, &mut parents, depth + 1);
             }
         }
     }
@@ -743,7 +743,7 @@ where
 
     fn json_schema(gen: &mut SchemaGenerator) -> Schema {
         let mut value = <WrapSchema<T, TA>>::json_schema(gen);
-        <WrapSchema<Vec<T>, KeyValueMap<TA>>>::kvmap_transform_schema(gen, &mut value);
+        <WrapSchema<Vec<T>, KeyValueMap<TA>>>::kvmap_transform_schema_0_8(gen, &mut value);
 
         SchemaObject {
             instance_type: Some(InstanceType::Object.into()),
@@ -919,12 +919,12 @@ macro_rules! schema_for_pickfirst {
                 .into()
             }
 
-            fn json_schema(gen: &mut SchemaGenerator) -> Schema {
+            fn json_schema(g: &mut SchemaGenerator) -> Schema {
                 let mut first = true;
                 let subschemas = std::vec![$(
                     {
                         let is_first = std::mem::replace(&mut first, false);
-                        let schema = gen.subschema_for::<WrapSchema<T, $param>>();
+                        let schema = g.subschema_for::<WrapSchema<T, $param>>();
 
                         if !is_first {
                             SchemaObject {