summaryrefslogtreecommitdiffstats
path: root/lib/core/libimagrt/src
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-02-15 22:15:58 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-02-15 22:15:58 +0100
commita6ad19a14f16c5344ea65df3efcc00464b2ad9aa (patch)
tree2d84c1a8021fe8b16faf6ef75e0b4a0b24cba8d0 /lib/core/libimagrt/src
parent08b7a46c74c37d7179d7b9332e8e165faa056ffc (diff)
parent6fd2c9b958ec17e5eb4bcfc365df126a89540bce (diff)
Merge branch 'redefine-storeid'
Finally merging the redefine of the StoreId implementation, which allows easier handling of StoreId objects. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/core/libimagrt/src')
-rw-r--r--lib/core/libimagrt/src/runtime.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index 8fb59022..4f2a485f 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -22,7 +22,6 @@ use std::process::Command;
use std::env;
use std::process::exit;
use std::io::Stdin;
-use std::sync::Arc;
use std::io::StdoutLock;
use std::borrow::Borrow;
use std::result::Result as RResult;
@@ -48,7 +47,6 @@ use libimagerror::trace::*;
use libimagerror::io::ToExitCode;
use libimagstore::store::Store;
use libimagstore::storeid::StoreId;
-use libimagstore::file_abstraction::InMemoryFileAbstraction;
use libimagutil::debug_result::DebugResult;
use spec::CliSpec;
use atty;
@@ -143,9 +141,7 @@ impl<'a> Runtime<'a> {
trace!("Config = {:#?}", config);
let store_result = if cli_app.use_inmemory_fs() {
- Store::new_with_backend(storepath,
- &config,
- Arc::new(InMemoryFileAbstraction::default()))
+ Store::new_inmemory(storepath, &config)
} else {
Store::new(storepath, &config)
};
@@ -418,7 +414,7 @@ impl<'a> Runtime<'a> {
trace!("Got IDs = {}", buf);
buf.lines()
.map(PathBuf::from)
- .map(|id| StoreId::new_baseless(id).map_err(Error::from))
+ .map(|id| StoreId::new(id).map_err(Error::from))
.collect()
})
} else {