VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into v1

Browse source
This commit is contained in:
Graham Esau 2024-05-23 17:30:53 +01:00
commit 1819dceb24
6 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CHANGELOG.md
View file

@ -1,5 +1,17 @@
# Changelog # 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 ## [0.8.19] - 2024-05-06
### Fixed: ### Fixed:

4
Cargo.lock generated
View file

@ -303,7 +303,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]] [[package]]
name = "schemars" name = "schemars"
version = "0.8.19" version = "0.8.21"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bigdecimal", "bigdecimal",
@ -329,7 +329,7 @@ dependencies = [
[[package]] [[package]]
name = "schemars_derive" name = "schemars_derive"
version = "0.8.19" version = "0.8.21"
dependencies = [ dependencies = [
"pretty_assertions", "pretty_assertions",
"proc-macro2", "proc-macro2",

4
schemars/Cargo.toml
View file

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

1
schemars/tests/default.rs
View file

@ -30,6 +30,7 @@ where
struct MyStruct { struct MyStruct {
my_int: i32, my_int: i32,
my_bool: bool, my_bool: bool,
my_optional_string: Option<String>,
#[serde(serialize_with = "custom_serialize")] #[serde(serialize_with = "custom_serialize")]
my_struct2: MyStruct2, my_struct2: MyStruct2,
#[serde( #[serde(

7
schemars/tests/expected/default.json
View file

@ -12,6 +12,13 @@
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"my_optional_string": {
"default": null,
"type": [
"string",
"null"
]
},
"my_struct2": { "my_struct2": {
"$ref": "#/$defs/MyStruct2", "$ref": "#/$defs/MyStruct2",
"default": "i:0 b:false" "default": "i:0 b:false"

2
schemars_derive/Cargo.toml
View file

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