Merge branch 'master' into v1

GREsau · May 23, 2024 · 25aca66 · 25aca66
2 parents 1247b89 + 5e20a37
commit 25aca66
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.8.21] - 2024-05-23
+
+### Fixed:
+
+- Fix `null` default not being set on generated schemas (https://github.com/GREsau/schemars/issues/295 / https://github.com/GREsau/schemars/pull/296)
+
+## [0.8.20] - 2024-05-18
+
+### Fixed:
+
+- Revert unintentional change in behaviour when combining `default` and `required` attributes (https://github.com/GREsau/schemars/issues/292)
+
 ## [0.8.19] - 2024-05-06
 
 ### Fixed:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/schemars/Cargo.toml b/schemars/Cargo.toml
@@ -3,7 +3,7 @@ name = "schemars"
 description = "Generate JSON Schemas from Rust code"
 homepage = "https://graham.cool/schemars/"
 repository = "https://github.com/GREsau/schemars"
-version = "0.8.19"
+version = "0.8.21"
 authors = ["Graham Esau <gesau@hotmail.co.uk>"]
 edition = "2021"
 license = "MIT"
@@ -14,8 +14,8 @@ build = "build.rs"
 rust-version = "1.60"
 
 [dependencies]
-schemars_derive = { version = "=0.8.19", optional = true, path = "../schemars_derive" }
-serde = "1.0"
+schemars_derive = { version = "=0.8.21", optional = true, path = "../schemars_derive" }
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.25"
 dyn-clone = "1.0"
 ref-cast = "1.0.22"

diff --git a/schemars/tests/default.rs b/schemars/tests/default.rs
@@ -30,6 +30,7 @@ where
 struct MyStruct {
     my_int: i32,
     my_bool: bool,
+    my_optional_string: Option<String>,
     #[serde(serialize_with = "custom_serialize")]
     my_struct2: MyStruct2,
     #[serde(

diff --git a/schemars/tests/expected/default.json b/schemars/tests/expected/default.json
@@ -12,6 +12,13 @@
       "type": "boolean",
       "default": false
     },
+    "my_optional_string": {
+      "default": null,
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "my_struct2": {
       "$ref": "#/$defs/MyStruct2",
       "default": "i:0 b:false"

diff --git a/schemars_derive/Cargo.toml b/schemars_derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "schemars_derive"
 description = "Macros for #[derive(JsonSchema)], for use with schemars"
 homepage = "https://graham.cool/schemars/"
 repository = "https://github.com/GREsau/schemars"
-version = "0.8.19"
+version = "0.8.21"
 authors = ["Graham Esau <gesau@hotmail.co.uk>"]
 edition = "2021"
 license = "MIT"