Merge pull request #1366 from nikomatsakis/2021-05-21-lang-agenda

overhaul lang agenda
rust-lang · May 25, 2021 · 67f108c · 67f108c
2 parents 2083b33 + 088a560
commit 67f108c
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 233 deletions.
diff --git a/lang-agenda.md b/lang-agenda.md
diff --git a/src/agenda.rs b/src/agenda.rs
@@ -513,90 +513,96 @@ pub fn prioritization<'a>() -> Box<dyn Action> {
 }
 
 pub fn lang<'a>() -> Box<dyn Action> {
-    let mut actions = Vec::new();
-
-    let mut queries = Vec::new();
-
-    queries.push(QueryMap {
-        name: "pending_proposals",
-        query: github::Query {
-            kind: github::QueryKind::List,
-            filters: vec![("state", "open"), ("is", "issue")],
-            include_labels: vec!["major-change"],
-            exclude_labels: vec!["charter-needed"],
-        },
-    });
-
-    queries.push(QueryMap {
-        name: "scheduled_meetings",
-        query: github::Query {
-            kind: github::QueryKind::List,
-            filters: vec![("state", "open"), ("is", "issue")],
-            include_labels: vec!["meeting-proposal", "meeting-scheduled"],
-            exclude_labels: vec![],
-        },
-    });
-
-    actions.push(Query {
-        repos: vec!["rust-lang/lang-team"],
-        queries,
-    });
-
-    let mut queries = Vec::new();
-
-    // https://github.com/rust-lang/rfcs/pulls?q=is%3Aopen+is%3Apr+label%3AT-lang
-    queries.push(QueryMap {
-        name: "newly_created_rfcs",
-        query: github::Query {
-            kind: github::QueryKind::List,
-            filters: vec![("state", "open"), ("is", "pr")],
-            include_labels: vec!["T-lang"],
-            exclude_labels: vec![],
-        },
-    });
-
-    //https://github.com/rust-lang/rfcs/pulls?q=is%3Aopen+is%3Apr+label%3AI-nominated+label%3AT-lang
-    queries.push(QueryMap {
-        name: "nominated_rfcs",
-        query: github::Query {
-            kind: github::QueryKind::List,
-            filters: vec![("state", "open"), ("is", "pr")],
-            include_labels: vec!["T-lang", "I-nominated"],
-            exclude_labels: vec![],
-        },
-    });
-
-    actions.push(Query {
-        repos: vec!["rust-lang/rfcs"],
-        queries,
-    });
-
-    actions.push(Query {
-        repos: vec!["rust-lang/rust", "rust-lang/reference"],
-        queries: vec![
-            QueryMap {
-                name: "p_high_issues",
-                query: github::Query {
-                    kind: github::QueryKind::List,
-                    filters: vec![("state", "open")],
-                    include_labels: vec!["T-lang", "P-high"],
-                    exclude_labels: vec![],
-                },
+    Box::new(Step {
+        name: "lang_agenda",
+        actions: vec![
+            Query {
+                repos: vec!["rust-lang/lang-team"],
+                queries: vec![
+                    QueryMap {
+                        name: "pending_project_proposals",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open"), ("is", "issue")],
+                            include_labels: vec!["major-change"],
+                            exclude_labels: vec!["charter-needed"],
+                        },
+                    },
+                    QueryMap {
+                        name: "pending_lang_team_prs",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open"), ("is", "pr")],
+                            include_labels: vec![],
+                            exclude_labels: vec![],
+                        },
+                    },
+                    QueryMap {
+                        name: "scheduled_meetings",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open"), ("is", "issue")],
+                            include_labels: vec!["meeting-proposal", "meeting-scheduled"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                ],
             },
-            QueryMap {
-                name: "nominated_prs_issues",
-                query: github::Query {
-                    kind: github::QueryKind::List,
-                    filters: vec![("state", "open")],
-                    include_labels: vec!["T-lang", "I-nominated"],
-                    exclude_labels: vec![],
-                },
+            Query {
+                repos: vec![
+                    "rust-lang/rfcs",
+                    "rust-lang/rust",
+                    "rust-lang/reference",
+                    "rust-lang/lang-team",
+                ],
+                queries: vec![
+                    QueryMap {
+                        name: "p_critical",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open")],
+                            include_labels: vec!["T-lang", "P-critical"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                    QueryMap {
+                        name: "nominated",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open")],
+                            include_labels: vec!["T-lang", "I-nominated"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                    QueryMap {
+                        name: "proposed_fcp",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open")],
+                            include_labels: vec!["T-lang", "proposed-final-comment-period"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                    QueryMap {
+                        name: "in_fcp",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open")],
+                            include_labels: vec!["T-lang", "final-comment-period"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                    QueryMap {
+                        name: "finished_fcp",
+                        query: github::Query {
+                            kind: github::QueryKind::List,
+                            filters: vec![("state", "open")],
+                            include_labels: vec!["T-lang", "finished-final-comment-period"],
+                            exclude_labels: vec![],
+                        },
+                    },
+                ],
             },
         ],
-    });
-
-    Box::new(Step {
-        name: "lang_agenda",
-        actions,
     })
 }
diff --git a/src/github.rs b/src/github.rs
@@ -766,10 +766,10 @@ impl Repository {
             .iter()
             .any(|&(key, value)| key == "is" && value == "pr");
         // negating filters can only be handled by the search api
-        let url = if use_issues {
-            self.build_issues_url(filters, include_labels)
-        } else if is_pr {
+        let url = if is_pr {
             self.build_pulls_url(filters, include_labels)
+        } else if use_issues {
+            self.build_issues_url(filters, include_labels)
         } else {
             self.build_search_issues_url(filters, include_labels, exclude_labels)
         };

diff --git a/templates/_issues_heading.tt b/templates/_issues_heading.tt
@@ -6,6 +6,8 @@
 
 **Link:** {{issue.html_url}}
 {%else%}
-{{empty}}
+
+None.
+
 {%endfor%}
 {% endmacro %}
diff --git a/templates/lang_agenda.tt b/templates/lang_agenda.tt
@@ -27,18 +27,28 @@ tags: triage-meeting
 
 * [Action items list](https://hackmd.io/gstfhtXYTHa3Jv-P_2RK7A)
 
-## Pending proposals
+## Pending lang team project proposals
 
-{{-issues_heading::render(issues=pending_proposals, empty="No pending proposals this time.")}}
+{{-issues_heading::render(issues=pending_project_proposals)}}
 
-## Nominated RFCs
+## PRs on the lang-team repo
 
-{{-issues_heading::render(issues=nominated_rfcs, empty="No nominated RFCs this time.")}}
+{{-issues_heading::render(issues=pending_lang_team_prs)}}
 
-## P-high issues on rust-lang/rust
+## Proposed FCPs
 
-{{-issues_heading::render(issues=p_high_issues, empty="No P-high issues this time.")}}
+**Check your boxes!**
 
-## Nominated PRs and issues
+{{-issues_heading::render(issues=proposed_fcp)}}
 
-{{-issues_heading::render(issues=nominated_prs_issues, empty="No nominated items this time.")}}
+## Active FCPs
+
+{{-issues_heading::render(issues=in_fcp)}}
+
+## P-critical issues
+
+{{-issues_heading::render(issues=p_critical)}}
+
+## Nominated RFCs, PRs and issues
+
+{{-issues_heading::render(issues=nominated)}}