From e1cee742e41466bd13906e294906365027c2b383 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Sun, 3 Sep 2023 13:32:45 +0800 Subject: [PATCH] return Option<&T> instead of &Option --- src/datatype/named.rs | 12 ++++++------ src/datatype/struct.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/datatype/named.rs b/src/datatype/named.rs index d4883b3..7e770d7 100644 --- a/src/datatype/named.rs +++ b/src/datatype/named.rs @@ -24,8 +24,8 @@ impl NamedDataTypeExt { &self.impl_location } - pub fn export(&self) -> &Option { - &self.export + pub fn export(&self) -> Option { + self.export } } @@ -55,12 +55,12 @@ impl NamedDataType { &self.comments } - pub fn deprecated(&self) -> &Option> { - &self.deprecated + pub fn deprecated(&self) -> Option<&Cow<'static, str>> { + self.deprecated.as_ref() } - pub fn ext(&self) -> &Option { - &self.ext + pub fn ext(&self) -> Option<&NamedDataTypeExt> { + self.ext.as_ref() } } diff --git a/src/datatype/struct.rs b/src/datatype/struct.rs index a78e8d6..329aa69 100644 --- a/src/datatype/struct.rs +++ b/src/datatype/struct.rs @@ -65,8 +65,8 @@ impl StructType { self.fields.iter() } - pub fn tag(&self) -> &Option> { - &self.tag + pub fn tag(&self) -> Option<&Cow<'static, str>> { + self.tag.as_ref() } }