Merge branch 'master' into v1

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(

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"