make group_cmnd express more clearly what it does

Author: squell

src/sudoers/mod.rs

@@ -10,8 +10,8 @@ mod entry;
 mod tokens;
 
 use std::collections::{HashMap, HashSet};
+use std::io;
 use std::path::{Path, PathBuf};
-use std::{io, mem};
 
 use crate::common::resolve::resolve_path;
 use crate::defaults;
@@ -208,28 +208,20 @@ fn group_cmd_specs_per_runas<'a>(
     cmnd_specs: impl Iterator<Item = (Option<&'a RunAs>, (Tag, &'a Spec<Command>))>,
     cmnd_aliases: &'a [Def<Command>],
 ) -> impl Iterator<Item = Entry<'a>> {
+    use std::borrow::BorrowMut;
+    let mut cmnd_specs = cmnd_specs.peekable();
     let mut entries = vec![];
-    let mut last_runas = None;
-    let mut collected_specs = vec![];
-
-    for (runas, (tag, spec)) in cmnd_specs {
-        if runas.map(|r| r as *const _) != last_runas.map(|r| r as *const _) {
-            if !collected_specs.is_empty() {
-                entries.push(Entry::new(
-                    last_runas,
-                    mem::take(&mut collected_specs),
-                    cmnd_aliases,
-                ));
-            }
-
-            last_runas = runas;
-        }
-
-        collected_specs.push((tag, spec));
-    }
 
-    if !collected_specs.is_empty() {
-        entries.push(Entry::new(last_runas, collected_specs, cmnd_aliases));
+    while let Some((cur_runas, _)) = cmnd_specs.peek() {
+        let cur_runas = *cur_runas;
+        let specs = cmnd_specs.borrow_mut().take_while(|(runas, _)| {
+            runas.map(|r| r as *const _) == cur_runas.map(|r| r as *const _)
+        });
+        entries.push(Entry::new(
+            cur_runas,
+            specs.map(|x| x.1).collect(),
+            cmnd_aliases,
+        ));
     }
 
     entries.into_iter()