Fix calls to Runtime::config() to use direct result

2 files changed, 5 insertions, 6 deletions

diff --git a/lib/etc/libimaginteraction/src/readline.rs b/lib/etc/libimaginteraction/src/readline.rs
index 7d498ce5..3f9a6399 100644
--- a/lib/etc/libimaginteraction/src/readline.rs
+++ b/lib/etc/libimaginteraction/src/readline.rs
@@ -34,9 +34,8 @@ pub struct Readline {
 impl Readline {
 
     pub fn new(rt: &Runtime) -> Result<Readline> {
-        let cfg = try!(rt.config().ok_or(IEK::NoConfigError));
+        let c = try!(rt.config().ok_or(IEK::NoConfigError));
 
-        let c = cfg.config();
         let histfile     = try!(c.lookup("ui.cli.readline_history_file").ok_or(IEK::ConfigError));
         let histsize     = try!(c.lookup("ui.cli.readline_history_size").ok_or(IEK::ConfigError));
         let histigndups  = try!(c.lookup("ui.cli.readline_history_ignore_dups").ok_or(IEK::ConfigError));
diff --git a/lib/etc/libimagutil/src/testing.rs b/lib/etc/libimagutil/src/testing.rs
index 183afb63..168a2650 100644
--- a/lib/etc/libimagutil/src/testing.rs
+++ b/lib/etc/libimagutil/src/testing.rs
@@ -51,7 +51,8 @@ macro_rules! make_mock_app {
             use libimagrt::spec::CliSpec;
             use libimagrt::runtime::Runtime;
             use libimagrt::error::RuntimeError;
-            use libimagrt::configuration::{Configuration, InternalConfiguration};
+            use libimagrt::configuration::InternalConfiguration;
+            use toml::Value;
 
             #[derive(Clone)]
             struct MockLinkApp<'a> {
@@ -89,9 +90,8 @@ macro_rules! make_mock_app {
             }
 
             #[allow(unused)]
-            pub fn generate_minimal_test_config() -> Option<Configuration> { ::toml::de::from_str("[store]\nimplicit-create=true")
-                            .map(Configuration::with_value)
-                            .ok()
+            pub fn generate_minimal_test_config() -> Option<Value> {
+                ::toml::de::from_str("[store]\nimplicit-create=true").ok()
             }
 
             #[allow(unused)]