From c98ec920a3cfd7bf9feec42032d3d90376dfadf2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 10 Feb 2019 00:57:11 +0100 Subject: Adapt for new interface of gen_vars() function Signed-off-by: Matthias Beyer --- lib/core/libimagrt/src/configuration.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/core/libimagrt') 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> { 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![]), ]; -- cgit v1.2.3