GREsau · May 17, 2022 · May 17, 2022
Showing with 9 additions and 31 deletions.

+5 −1 CHANGELOG.md

+2 −2 schemars/Cargo.toml

+0 −12 schemars/tests/default.rs

+0 −14 schemars/tests/expected/generic_default.json

+1 −1 schemars_derive/Cargo.toml

+1 −1 schemars_derive/src/schema_exprs.rs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
+## [0.8.10] - 2022-05-17
+- Undo "Support generic default values in default attributes (https://github.com/GREsau/schemars/pull/83)" as it inadvertently introduced a breaking change (https://github.com/GREsau/schemars/issues/144)
+
 ## [0.8.9] - 2022-05-16
 ### Added:
-- Support generic default values in `default` attributes (https://github.com/GREsau/schemars/pull/83)
+- ~~Support generic default values in `default` attributes (https://github.com/GREsau/schemars/pull/83)~~
+    - ⚠️ **This inadvertently introduced a breaking change and was removed in 0.8.10**
 - Add missing MIT licence text for usage of code from regex_syntax crate (https://github.com/GREsau/schemars/pull/132)
 - Support uuid v1 and arrayvec 0.7 via feature flags `uuid1` and `arrayvec07` (https://github.com/GREsau/schemars/pull/142)
     - This also adds `uuid08` and `arrayvec05` feature flags for the previously supported versions of these crates. The existing `uuid` and `arrayvec` flags are still supported for backward-compatibility, but they are **deprecated**.

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.9"
+version = "0.8.10"
 authors = ["Graham Esau <gesau@hotmail.co.uk>"]
 edition = "2018"
 license = "MIT"
@@ -13,7 +13,7 @@ categories = ["encoding"]
 build = "build.rs"
 
 [dependencies]
-schemars_derive = { version = "=0.8.9", optional = true, path = "../schemars_derive" }
+schemars_derive = { version = "=0.8.10", optional = true, path = "../schemars_derive" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 dyn-clone = "1.0"

diff --git a/schemars/tests/default.rs b/schemars/tests/default.rs
@@ -56,15 +56,3 @@ struct NotSerialize;
 fn schema_default_values() -> TestResult {
     test_default_generated_schema::<MyStruct>("default")
 }
-
-#[allow(dead_code)]
-#[derive(JsonSchema)]
-struct StructWithGenericDefaults {
-    #[serde(default = "Vec::new")]
-    a_vec: Vec<String>,
-}
-
-#[test]
-fn schema_with_generic_default_value() -> TestResult {
-    test_default_generated_schema::<StructWithGenericDefaults>("generic_default")
-}
diff --git a/schemars/tests/expected/generic_default.json b/schemars/tests/expected/generic_default.json
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.9"
+version = "0.8.10"
 authors = ["Graham Esau <gesau@hotmail.co.uk>"]
 edition = "2018"
 license = "MIT"

diff --git a/schemars_derive/src/schema_exprs.rs b/schemars_derive/src/schema_exprs.rs
@@ -581,7 +581,7 @@ fn field_default_expr(field: &Field, container_has_default: bool) -> Option<Toke
             quote!(container_default.#member)
         }
         SerdeDefault::Default => quote!(<#ty>::default()),
-        SerdeDefault::Path(path) => quote!({ #path() as #ty }),
+        SerdeDefault::Path(path) => quote!(#path()),
     };
 
     let default_expr = match field.serde_attrs.skip_serializing_if() {