From fea94045f83486a26bbfe5d81f779325729cbdb5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 2 Jan 2021 16:02:16 +0100 Subject: Fix variable name: "_res" -> "res" Signed-off-by: Matthias Beyer --- src/main.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 906f884..80eec21 100644 --- a/src/main.rs +++ b/src/main.rs @@ -102,12 +102,12 @@ fn hash_map_targets<'a>(c : &'a Config, targets : Vec) -> Result)>> { debug!("targets: {:?}", targets); - let mut _res : HashMap<&String, (&LogItem, Vec<(String, String)>)> = HashMap::new(); + let mut res : HashMap<&String, (&LogItem, Vec<(String, String)>)> = HashMap::new(); for li in c.items() { for t in targets.clone() { if li.aliases().contains(&t.target) { - if _res.contains_key(&li.file()) { - if let Some(&mut (_litem, ref mut cnames)) = _res.get_mut(&li.file()) { + if res.contains_key(&li.file()) { + if let Some(&mut (_litem, ref mut cnames)) = res.get_mut(&li.file()) { cnames.push(( cname_from_target(&t.target)?, t.target.clone()) @@ -115,7 +115,7 @@ fn hash_map_targets<'a>(c : &'a Config, targets : Vec) } } else { - _res.insert( + res.insert( li.file(), ( &li, @@ -126,7 +126,8 @@ fn hash_map_targets<'a>(c : &'a Config, targets : Vec) } } } - Ok(_res) + + Ok(res) } /// splits the target and return the capture name part @@ -143,7 +144,7 @@ fn cname_from_target<'a>(t : &'a String) -> Result { fn hash_map_iter(h : HashMap<&String, (&LogItem, Vec<(String, String)>)>, d_from : i64, d_to : i64) -> Result> { - let mut _res = Vec::new(); + let mut res = Vec::new(); for (file, &(logitem, ref cns)) in h.iter() { // prepare an empty Vector of Series @@ -203,10 +204,10 @@ fn hash_map_iter(h : HashMap<&String, (&LogItem, Vec<(String, String)>)>, d_from // fill the prepared vector with all Series's for series in series_vec.iter() { - _res.push(TargetData::Series((*series).clone())); + res.push(TargetData::Series((*series).clone())); } } - Ok(_res) + Ok(res) } -- cgit v1.2.3