From c1b9ebdae64d2a6e4f970392254a74b519f76d47 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 13 Feb 2022 01:33:04 +0900 Subject: [PATCH] [REFACTORING]Reduce duplicated closure --- plume-common/src/activity_pub/mod.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plume-common/src/activity_pub/mod.rs b/plume-common/src/activity_pub/mod.rs index 493980bc..b7ebae31 100644 --- a/plume-common/src/activity_pub/mod.rs +++ b/plume-common/src/activity_pub/mod.rs @@ -446,15 +446,12 @@ pub trait ToAsUri { impl ToAsUri for OneOrMany { fn to_as_uri(&self) -> Option { self.as_one() - .and_then(|prop| prop.as_xsd_any_uri().map(|uri| uri.to_string())) + .and_then(|prop| prop.as_xsd_any_uri()) .or_else(|| { - self.as_many().and_then(|props| { - props - .iter() - .next() - .and_then(|prop| prop.as_xsd_any_uri().map(|uri| uri.to_string())) - }) + self.as_many() + .and_then(|props| props.iter().next().and_then(|prop| prop.as_xsd_any_uri())) }) + .map(|uri| uri.to_string()) } }