From ce9146ff6a9f997e46a89f6bb959d2ea969b1f2c Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Thu, 19 May 2022 12:13:33 +0000 Subject: [PATCH] fix(properties): according to clippy --- --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -858,8 +858,8 @@ }) }) .collect() - }).unwrap_or( - properties.iter() + }).unwrap_or_else( + || properties.iter() .map(|(key, value)| Property { key: key.clone(), value: value.clone(), @@ -887,8 +887,8 @@ }) }) .collect() - }).unwrap_or( - permissions.iter() + }).unwrap_or_else( + || permissions.iter() .map(|(key, permission)| PropertyKeyPermission { key: key.clone(), permission: permission.clone(), --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -179,7 +179,7 @@ let weight = >::delete_collection_properties(property_keys.len() as u32); with_weight( - >::delete_collection_properties(self, &sender, property_keys), + >::delete_collection_properties(self, sender, property_keys), weight, ) } @@ -374,8 +374,8 @@ }) }) .collect() - }).unwrap_or( - properties.iter().map(|(key, value)| Property { + }).unwrap_or_else( + || properties.iter().map(|(key, value)| Property { key: key.clone(), value: value.clone(), }) --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -353,8 +353,8 @@ ) -> DispatchResult { let permission = >::property_permissions(collection.id) .get(property_key) - .map(|p| p.clone()) - .unwrap_or(PropertyPermission::none()); + .cloned() + .unwrap_or_else(PropertyPermission::none); let token_data = >::get((collection.id, token_id)) .ok_or(>::TokenNotFound)?; -- gitstuff