by-groups listing infra

src/justfile.rs

@@ -497,20 +497,7 @@ impl<'src> Justfile<'src> {
       .values()
       .map(AsRef::as_ref)
       .filter(|recipe| recipe.is_public())
-      .flat_map(|recipe| {
-          recipe.groups()
-              /*
-          //TODO this should use a .groups() method
-        let groups = recipe.attributes.iter().filter_map(|attr| {
-          if let Attribute::Group { name } = attr {
-            Some(*name)
-          } else {
-            None
-          }
-        });
-        groups
-        */
-      })
+      .flat_map(|recipe| recipe.groups())
       .collect()
   }
 }

src/list_recipes.rs

@@ -104,12 +104,25 @@ pub(crate) fn list(config: &Config, level: usize, justfile: &Justfile) {
   }
 
   let public_recipes = justfile.public_recipes(config.unsorted);
-  /*
-  let mut by_groups = HashMap::new();
-  for recipe in public_recipes {
-
+  let mut by_groups: HashMap<Option<&str>, Vec<&str>> = HashMap::new();
+
+  for recipe in &public_recipes {
+    let recipe_name = recipe.name();
+    let groups = recipe.groups();
+    if groups.is_empty() {
+      by_groups
+        .entry(None)
+        .and_modify(|e| e.push(recipe_name))
+        .or_insert(vec![recipe_name]);
+    } else {
+      for group in groups {
+        by_groups
+          .entry(Some(group))
+          .and_modify(|e| e.push(recipe_name))
+          .or_insert(vec![recipe_name]);
+      }
+    }
   }
-  */
 
   for recipe in public_recipes {
     let aliases: &[&str] = recipe_aliases

src/recipe.rs

@@ -424,7 +424,7 @@ impl<'src, D> Recipe<'src, D> {
 
   pub(crate) fn groups(&self) -> HashSet<&str> {
     let mut groups = HashSet::new();
-    for attr in self.attributes.iter() {
+    for attr in &self.attributes {
       if let Attribute::Group { name } = attr {
         groups.insert(name.as_ref());
       }