summaryrefslogtreecommitdiffstats
path: root/lib/core/libimagrt
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-02-10 00:57:11 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-02-11 03:52:04 +0100
commitc98ec920a3cfd7bf9feec42032d3d90376dfadf2 (patch)
treeac8fd2f2fd4a6944b4e7decd6db30cc96d63ad86 /lib/core/libimagrt
parent7680dcf3b86382baaf714306cb5bc8fea0e23ce4 (diff)
Adapt for new interface of gen_vars() function
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/core/libimagrt')
-rw-r--r--lib/core/libimagrt/src/configuration.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/core/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs
index 65353b2f..286cad07 100644
--- a/lib/core/libimagrt/src/configuration.rs
+++ b/lib/core/libimagrt/src/configuration.rs
@@ -47,22 +47,22 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Option<Value>> {
use libimagerror::trace::trace_error;
let variants : Vec<&'static str> = vec!["config", "config.toml", "imagrc", "imagrc.toml"];
- let modifier = |base: &PathBuf, v: &'static str| {
+ let modifier = |base: &PathBuf, v: &&str| {
let mut base = base.clone();
- base.push(String::from(v));
+ base.push(String::from(*v));
base
};
let vals = vec![
vec![searchpath.clone()],
- gen_vars(searchpath, variants, &modifier),
+ gen_vars(searchpath, variants.iter(), &modifier),
env::var("HOME")
- .map(|home| gen_vars(&PathBuf::from(home), variants, &modifier))
+ .map(|home| gen_vars(&PathBuf::from(home), variants.iter(), &modifier))
.unwrap_or(vec![]),
xdg_basedir::get_data_home()
- .map(|data_dir| gen_vars(&data_dir, variants, &modifier))
+ .map(|data_dir| gen_vars(&data_dir, variants.iter(), &modifier))
.unwrap_or(vec![]),
];