From 0e6599f1922a972d5f8083b9aaf099c798d33915 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 28 Aug 2017 14:55:33 +0200
Subject: [PATCH] Fix imag-ref

---
 bin/core/imag-ref/src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/core/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs
index aa2f7d08..98d88f7b 100644
--- a/bin/core/imag-ref/src/main.rs
+++ b/bin/core/imag-ref/src/main.rs
@@ -50,7 +50,7 @@ use ui::build_ui;
 
 use std::path::PathBuf;
 
-use libimagentryref::reference::Ref;
+use libimagentryref::refstore::RefStore;
 use libimagentryref::flags::RefFlags;
 use libimagerror::trace::trace_error;
 use libimagrt::setup::generate_runtime_setup;
@@ -84,7 +84,7 @@ fn add(rt: &Runtime) {
         .with_content_hashing(cmd.is_present("track-content"))
         .with_permission_tracking(cmd.is_present("track-permissions"));
 
-    match Ref::create(rt.store(), path, flags) {
+    match RefStore::create(rt.store(), path, flags) {
         Ok(r) => {
             debug!("Reference created: {:?}", r);
             info!("Ok");
@@ -104,7 +104,7 @@ fn remove(rt: &Runtime) {
     let yes  = cmd.is_present("yes");
 
     if yes || ask_bool(&format!("Delete Ref with hash '{}'", hash)[..], None) {
-        match Ref::delete_by_hash(rt.store(), hash) {
+        match rt.store().delete_by_hash(hash) {
             Err(e) => trace_error(&e),
             Ok(_) => info!("Ok"),
         }
@@ -128,7 +128,7 @@ fn list(rt: &Runtime) {
 
     let iter = match rt.store().retrieve_for_module("ref") {
         Ok(iter) => iter.filter_map(|id| {
-            match Ref::get(rt.store(), id) {
+            match rt.store().get(id) {
                 Ok(r) => Some(r),
                 Err(e) => {
                     trace_error(&e);
@@ -147,7 +147,7 @@ fn list(rt: &Runtime) {
         .check_changed(do_check_changed)
         .check_changed_content(do_check_changed_content)
         .check_changed_permiss(do_check_changed_permiss)
-        .list(iter.map(|e| e.into()))
+        .list(iter.filter_map(Into::into))
         .ok();
 }