Merge pull request #339 from rust-lang/randomize-stalled-acps

randomize stalled ACPs in the agenda generator

Author: Amanieu

tools/agenda-generator/Cargo.toml

@@ -9,6 +9,7 @@ chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
 color-eyre = "0.6"
 itertools = "0.12"
+rand = "0.8.5"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

tools/agenda-generator/src/generator.rs

@@ -4,6 +4,7 @@ use color_eyre::{
     Section, SectionExt,
 };
 use itertools::Itertools;
+use rand::{seq::SliceRandom, thread_rng};
 use reqwest::header::{AUTHORIZATION, USER_AGENT};
 use serde::de::{DeserializeOwned, Deserializer};
 use serde::Deserialize;
@@ -77,7 +78,7 @@ impl Generator {
             .repo("rust-lang/rust")
             .write(&mut self)?;
 
-        GithubQuery::new("new change proposal")
+        let new_proposals = GithubQuery::new("new change proposal")
             .labels(&["api-change-proposal"])
             .repo("rust-lang/libs-team")
             .sort(Sort::Newest)
@@ -89,6 +90,8 @@ impl Generator {
             .repo("rust-lang/libs-team")
             .sort(Sort::LeastRecentlyUpdated)
             .take(5)
+            .skip(new_proposals.iter())
+            .shuffle(true)
             .write(&mut self)?;
 
         writeln!(&mut self.agenda, "_Generated by [fully-automatic-rust-libs-team-triage-meeting-agenda-generator](https://github.com/rust-lang/libs-team/tree/main/tools/agenda-generator)_")?;
@@ -454,6 +457,8 @@ struct GithubQuery {
     repos: Vec<&'static str>,
     sort: Option<Sort>,
     count: Option<usize>,
+    to_skip: Vec<String>,
+    shuffle: bool,
     state: State,
 }
 
@@ -490,7 +495,9 @@ impl GithubQuery {
             excluded_labels: vec![],
             repos: vec![],
             sort: None,
+            to_skip: vec![],
             count: None,
+            shuffle: false,
             state: State::Open,
         }
     }
@@ -515,6 +522,16 @@ impl GithubQuery {
         self
     }
 
+    fn shuffle(&mut self, shuffle: bool) -> &mut Self {
+        self.shuffle = shuffle;
+        self
+    }
+
+    fn skip<'a>(&mut self, to_skip: impl Iterator<Item=&'a Issue>) -> &mut Self {
+        self.to_skip = to_skip.map(|i| i.html_url.clone()).collect();
+        self
+    }
+
     fn take(&mut self, count: usize) -> &mut Self {
         self.count = Some(count);
         self
@@ -525,7 +542,10 @@ impl GithubQuery {
         self
     }
 
-    fn write(&mut self, generator: &mut Generator) -> Result<()> {
+    fn write(&mut self, generator: &mut Generator) -> Result<Vec<Issue>> {
+        let mut all_issues = Vec::new();
+
+
         for repo in &self.repos {
             for labels in &self.labels {
                 let cs_labels = labels.join(",");
@@ -547,8 +567,11 @@ impl GithubQuery {
                             .all(|&label| issue.labels.iter().any(|x| x == label))
                     })
                 });
+                let issues = issues.filter(|i| {
+                    !self.to_skip.iter().any(|s| *s == i.html_url)
+                });
 
-                let issues: Vec<_> = issues.collect();
+                let mut issues: Vec<_> = issues.collect();
 
                 if issues.is_empty() {
                     continue;
@@ -575,18 +598,22 @@ impl GithubQuery {
                 //    labels = labels.join("` `"),
                 //    url = url,
                 //)?;
-                let issues = if let Some(count) = self.count {
-                    &issues[..count]
-                } else {
-                    &issues[..]
-                };
+
+                if self.shuffle {
+                    issues.shuffle(&mut thread_rng());
+                }
+
+                if let Some(count) = self.count {
+                    issues.truncate(count);
+                }
                 generator.write_issues(self.name, &issues)?;
+                all_issues.append(&mut issues);
             }
         }
 
         writeln!(generator.agenda)?;
 
-        Ok(())
+        Ok(all_issues)
     }
 }
 
@@ -600,6 +627,7 @@ struct Issue {
     labels: Vec<String>,
 }
 
+
 fn escape(v: &str) -> String {
     let mut s = String::with_capacity(v.len() + 10);
     v.chars().for_each(|c| {