matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Use ok_or_else() instead of ok_or()

Browse source
This commit is contained in:
Matthias Beyer 2018-04-24 21:16:55 +02:00
parent 22170a0d55
commit f1142c414d
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/core/libimagstore/src/configuration.rs
View file

@ -31,7 +31,7 @@ pub fn config_implicit_store_create_allowed(config: &Option<Value>) -> Result<bo
let key = "store.implicit-create"; let key = "store.implicit-create";
if let Some(ref t) = *config { if let Some(ref t) = *config {
t.read_bool(key)?.ok_or(SE::from_kind(SEK::ConfigKeyMissingError(key))) t.read_bool(key)?.ok_or_else(|| SE::from_kind(SEK::ConfigKeyMissingError(key)))
} else { } else {
Ok(false) Ok(false)
} }

8
lib/core/libimagstore/src/file_abstraction/inmemory.rs
View file

@ -71,7 +71,7 @@ impl FileAbstractionInstance for InMemoryFileAbstractionInstance {
mtx.get_mut() mtx.get_mut()
.get(&self.absent_path) .get(&self.absent_path)
.cloned() .cloned()
.ok_or(SE::from_kind(SEK::FileNotFound)) .ok_or_else(|| SE::from_kind(SEK::FileNotFound))
}) })
} }
@ -123,7 +123,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
.get_mut() .get_mut()
.remove(path) .remove(path)
.map(|_| ()) .map(|_| ())
.ok_or(SE::from_kind(SEK::FileNotFound)) .ok_or_else(|| SE::from_kind(SEK::FileNotFound))
} }
fn copy(&self, from: &PathBuf, to: &PathBuf) -> Result<(), SE> { fn copy(&self, from: &PathBuf, to: &PathBuf) -> Result<(), SE> {
@ -131,7 +131,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
let mut mtx = self.backend().lock().expect("Locking Mutex failed"); let mut mtx = self.backend().lock().expect("Locking Mutex failed");
let backend = mtx.get_mut(); let backend = mtx.get_mut();
let a = backend.get(from).cloned().ok_or(SE::from_kind(SEK::FileNotFound))?; let a = backend.get(from).cloned().ok_or_else(|| SE::from_kind(SEK::FileNotFound))?;
backend.insert(to.clone(), a); backend.insert(to.clone(), a);
debug!("Copying: {:?} -> {:?} worked", from, to); debug!("Copying: {:?} -> {:?} worked", from, to);
Ok(()) Ok(())
@ -142,7 +142,7 @@ impl FileAbstraction for InMemoryFileAbstraction {
let mut mtx = self.backend().lock().expect("Locking Mutex failed"); let mut mtx = self.backend().lock().expect("Locking Mutex failed");
let backend = mtx.get_mut(); let backend = mtx.get_mut();
let a = backend.get(from).cloned().ok_or(SE::from_kind(SEK::FileNotFound))?; let a = backend.get(from).cloned().ok_or_else(|| SE::from_kind(SEK::FileNotFound))?;
backend.insert(to.clone(), a); backend.insert(to.clone(), a);
debug!("Renaming: {:?} -> {:?} worked", from, to); debug!("Renaming: {:?} -> {:?} worked", from, to);
Ok(()) Ok(())

4
lib/core/libimagstore/src/store.rs
View file

@ -1007,13 +1007,13 @@ fn has_only_tables(t: &Value) -> Result<bool> {
fn has_main_section(t: &Value) -> Result<bool> { fn has_main_section(t: &Value) -> Result<bool> {
t.read("imag")? t.read("imag")?
.ok_or(SE::from_kind(SEK::ConfigKeyMissingError("imag"))) .ok_or_else(|| SE::from_kind(SEK::ConfigKeyMissingError("imag")))
.map(Value::is_table) .map(Value::is_table)
} }
fn has_imag_version_in_main_section(t: &Value) -> Result<bool> { fn has_imag_version_in_main_section(t: &Value) -> Result<bool> {
t.read_string("imag.version")? t.read_string("imag.version")?
.ok_or(SE::from_kind(SEK::ConfigKeyMissingError("imag.version"))) .ok_or_else(|| SE::from_kind(SEK::ConfigKeyMissingError("imag.version")))
.map(String::from) .map(String::from)
.map(|s| ::semver::Version::parse(&s).is_ok()) .map(|s| ::semver::Version::parse(&s).is_ok())
} }

2
lib/core/libimagstore/src/storeid.rs
View file

@ -116,7 +116,7 @@ impl StoreId {
.unwrap_or_else(|| self.id.clone()) .unwrap_or_else(|| self.id.clone())
.to_str() .to_str()
.map(String::from) .map(String::from)
.ok_or(SE::from_kind(SEK::StoreIdHandlingError)) .ok_or_else(|| SE::from_kind(SEK::StoreIdHandlingError))
} }
/// Returns the components of the `id` part of the StoreId object. /// Returns the components of the `id` part of the StoreId object.