summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-02-05 01:25:22 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-02-11 03:23:17 +0100
commit01fa19aadebbe94c6b759608e2f75f2714b74c94 (patch)
tree483f7447dccad84a455a66f98e2779bac4e268c9 /lib
parent6b34e99b75f0b98cffa58d5e62051f11276ba820 (diff)
Remove clone() calls
We should be able, from the signature of the `generate_variants()` helper function, to pass a `Vec<&T>` here, so cloning should not be necessary. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/core/libimagrt/src/configuration.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/core/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs
index eb5bf21b..65353b2f 100644
--- a/lib/core/libimagrt/src/configuration.rs
+++ b/lib/core/libimagrt/src/configuration.rs
@@ -46,7 +46,7 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Option<Value>> {
use libimagutil::variants::generate_variants as gen_vars;
use libimagerror::trace::trace_error;
- let variants = vec!["config", "config.toml", "imagrc", "imagrc.toml"];
+ let variants : Vec<&'static str> = vec!["config", "config.toml", "imagrc", "imagrc.toml"];
let modifier = |base: &PathBuf, v: &'static str| {
let mut base = base.clone();
base.push(String::from(v));
@@ -55,13 +55,15 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Option<Value>> {
let vals = vec![
vec![searchpath.clone()],
- gen_vars(searchpath, variants.clone(), &modifier),
+ gen_vars(searchpath, variants, &modifier),
- env::var("HOME").map(|home| gen_vars(&PathBuf::from(home), variants.clone(), &modifier))
- .unwrap_or(vec![]),
+ env::var("HOME")
+ .map(|home| gen_vars(&PathBuf::from(home), variants, &modifier))
+ .unwrap_or(vec![]),
- xdg_basedir::get_data_home().map(|data_dir| gen_vars(&data_dir, variants.clone(), &modifier))
- .unwrap_or(vec![]),
+ xdg_basedir::get_data_home()
+ .map(|data_dir| gen_vars(&data_dir, variants, &modifier))
+ .unwrap_or(vec![]),
];
let config = Itertools::flatten(vals.iter())