Repository: GREsau/schemars
Pull request #132 (2022-03-02 17:29:49)

Add license notice to regex_syntax.rs
The comment in the code says this code was copied from another source
with an appropriate link. However just local to this file it is not
clear what the license terms of that code are. I added the license
notice to this file that governs the particular code that was copied
over.

I would like to use this crate in an environment where we want to be
clear about licensing. Hopefully this is an okay change otherwise I
would be more than happy to do this a different way as long as the
license provenance is clear.

ralpha: Given the MIT license of both projects I think this a valid addition. ( I don't have merge permissions, so @GREsau has to merge this )
rokob: @GREsau Friendly ping on this, any hope of merging this in?

Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e78341..734448f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.8.9] - **in-dev**
+### Changed:
+- Support generic default values in `default` attributes (https://github.com/GREsau/schemars/pull/83)
+
 ## [0.8.8] - 2021-11-25
 ### Added:
 - Implement `JsonSchema` for types from `rust_decimal` and `bigdecimal` crates (https://github.com/GREsau/schemars/pull/101)
diff --git a/schemars_derive/src/regex_syntax.rs b/schemars_derive/src/regex_syntax.rs
index 353bf8d..750d1e2 100644
--- a/schemars_derive/src/regex_syntax.rs
+++ b/schemars_derive/src/regex_syntax.rs
@@ -1,5 +1,31 @@
 // Copied from regex_syntax crate to avoid pulling in the whole crate just for a utility function
 // https://github.com/rust-lang/regex/blob/ff283badce21dcebd581909d38b81f2c8c9bfb54/regex-syntax/src/lib.rs
+//
+// Copyright (c) 2014 The Rust Project Developers
+//
+// Permission is hereby granted, free of charge, to any
+// person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the
+// Software without restriction, including without
+// limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice
+// shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+// ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+// SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+// IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
 
 pub fn escape(text: &str) -> String {
     let mut quoted = String::new();
diff --git a/schemars_derive/src/schema_exprs.rs b/schemars_derive/src/schema_exprs.rs
index c5b1672..f41e37a 100644
--- 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()),
+        SerdeDefault::Path(path) => quote!({ #path() as #ty }),
     };
 
     let default_expr = match field.serde_attrs.skip_serializing_if() {


Test patch:
diff --git a/schemars/tests/default.rs b/schemars/tests/default.rs
index 0d68d0e..c44a3c2 100644
--- a/schemars/tests/default.rs
+++ b/schemars/tests/default.rs
@@ -54,3 +54,14 @@ pub struct NotSerialize;
 fn schema_default_values() -> TestResult {
     test_default_generated_schema::<MyStruct>("default")
 }
+
+#[derive(JsonSchema, Debug)]
+pub struct StructWithGenericDefaults {
+    #[serde(default = "Vec::new")]
+    pub 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
new file mode 100644
index 0000000..095b999
--- /dev/null
+++ b/schemars/tests/expected/generic_default.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "StructWithGenericDefaults",
+  "type": "object",
+  "properties": {
+    "a_vec": {
+      "default": [],
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}
\ No newline at end of file