matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Reimplement StoreId::to_str() to remove unwrap()

Browse source
This commit is contained in:
Matthias Beyer 2016-10-13 14:31:32 +02:00
parent 52367edc83
commit 3d572dda0f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libimagstore/src/storeid.rs
View file

@ -95,16 +95,14 @@ impl StoreId {
} }
pub fn to_str(&self) -> Result<String> { pub fn to_str(&self) -> Result<String> {
if self.base.is_some() { self.base
let mut base = self.base.as_ref().cloned().unwrap(); .as_ref()
base.push(self.id.clone()); .cloned()
base .map(|mut base| { base.push(self.id.clone()); base })
} else { .unwrap_or_else(|| self.id.clone())
self.id.clone() .to_str()
} .map(String::from)
.to_str() .ok_or(SEK::StoreIdHandlingError.into_error())
.map(String::from)
.ok_or(SEK::StoreIdHandlingError.into_error())
} }
/// Returns the components of the `id` part of the StoreId object. /// Returns the components of the `id` part of the StoreId object.