From dada8582eecd2f1959616c6a6fd6091cae8bddeb Mon Sep 17 00:00:00 2001 From: Graham Esau Date: Sat, 27 Mar 2021 10:34:39 +0000 Subject: [PATCH] Fix rustc 1.37 build --- schemars_derive/src/metadata.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schemars_derive/src/metadata.rs b/schemars_derive/src/metadata.rs index 2036571..435469a 100644 --- a/schemars_derive/src/metadata.rs +++ b/schemars_derive/src/metadata.rs @@ -35,8 +35,8 @@ impl ToTokens for SchemaMetadata<'_> { impl<'a> SchemaMetadata<'a> { pub fn from_attrs(attrs: &'a Attrs) -> Self { SchemaMetadata { - title: attrs.title.as_deref().and_then(none_if_empty), - description: attrs.description.as_deref().and_then(none_if_empty), + title: attrs.title.as_ref().and_then(none_if_empty), + description: attrs.description.as_ref().and_then(none_if_empty), deprecated: attrs.deprecated, examples: &attrs.examples, read_only: false, @@ -106,7 +106,8 @@ impl<'a> SchemaMetadata<'a> { } } -fn none_if_empty(s: &str) -> Option<&str> { +#[allow(clippy::ptr_arg)] +fn none_if_empty(s: &String) -> Option<&str> { if s.is_empty() { None } else {