From cd73be256b22404c342bad782c2e1453f3e5f526 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 Apr 2016 21:07:39 +0200 Subject: [PATCH] imag-store: Replace .err().unwrap() with .unwrap_err() --- imag-store/src/create.rs | 2 +- imag-store/src/delete.rs | 2 +- imag-store/src/main.rs | 2 +- imag-store/src/retrieve.rs | 2 +- imag-store/src/update.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imag-store/src/create.rs b/imag-store/src/create.rs index 9d90f642..35ac162a 100644 --- a/imag-store/src/create.rs +++ b/imag-store/src/create.rs @@ -38,7 +38,7 @@ pub fn create(rt: &Runtime) { let path = build_entry_path(rt.store(), path.unwrap()); if path.is_err() { - trace_error(&path.err().unwrap()); + trace_error(&path.unwrap_err()); exit(1); } let path = path.unwrap(); diff --git a/imag-store/src/delete.rs b/imag-store/src/delete.rs index 71bf0f91..f232ec0a 100644 --- a/imag-store/src/delete.rs +++ b/imag-store/src/delete.rs @@ -14,7 +14,7 @@ pub fn delete(rt: &Runtime) { .map(|id| { let path = build_entry_path(rt.store(), id); if path.is_err() { - trace_error(&path.err().unwrap()); + trace_error(&path.unwrap_err()); exit(1); } let path = path.unwrap(); diff --git a/imag-store/src/main.rs b/imag-store/src/main.rs index 4b5968d7..034e2b15 100644 --- a/imag-store/src/main.rs +++ b/imag-store/src/main.rs @@ -36,7 +36,7 @@ fn main() { rt.unwrap() } else { println!("Could not set up Runtime"); - println!("{:?}", rt.err().unwrap()); + println!("{:?}", rt.unwrap_err()); exit(1); } }; diff --git a/imag-store/src/retrieve.rs b/imag-store/src/retrieve.rs index cc43ece2..8fbeeda3 100644 --- a/imag-store/src/retrieve.rs +++ b/imag-store/src/retrieve.rs @@ -19,7 +19,7 @@ pub fn retrieve(rt: &Runtime) { .map(|id| { let path = build_entry_path(rt.store(), id); if path.is_err() { - trace_error(&path.err().unwrap()); + trace_error(&path.unwrap_err()); exit(1); } let path = path.unwrap(); diff --git a/imag-store/src/update.rs b/imag-store/src/update.rs index d37da1c2..0e054106 100644 --- a/imag-store/src/update.rs +++ b/imag-store/src/update.rs @@ -16,7 +16,7 @@ pub fn update(rt: &Runtime) { .map(|id| { let path = build_entry_path(rt.store(), id); if path.is_err() { - trace_error(&path.err().unwrap()); + trace_error(&path.unwrap_err()); exit(1); } let path = path.unwrap();