summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-05-11 21:04:13 +0200
committerGitHub <noreply@github.com>2018-05-11 21:04:13 +0200
commitc8da09f687c83bd6ec920d242c74917f2720a36b (patch)
tree61cb21528d92593b0d3d6233615a4021eac80b34
parentc911be87ee81631648b8fc6fcaa9c8c7a84612d8 (diff)
parent8d1022b1ac08fd79622a57a9c5cfc16512e7e936 (diff)
Merge pull request #1491 from matthiasbeyer/fix-rustc126-flatten-warning
Fix: Explicitely use Itertools::flatten()
-rw-r--r--lib/core/libimagrt/src/configuration.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/core/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs
index 0706935a..70a13116 100644
--- a/lib/core/libimagrt/src/configuration.rs
+++ b/lib/core/libimagrt/src/configuration.rs
@@ -54,7 +54,7 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Value> {
base
};
- vec![
+ let vals = vec![
vec![searchpath.clone()],
gen_vars(searchpath, variants.clone(), &modifier),
@@ -63,8 +63,9 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Value> {
xdg_basedir::get_data_home().map(|data_dir| gen_vars(&data_dir, variants.clone(), &modifier))
.unwrap_or(vec![]),
- ].iter()
- .flatten()
+ ];
+
+ Itertools::flatten(vals.iter())
.filter(|path| path.exists() && path.is_file())
.filter_map(|path| {
let content = {