overhaul lang agenda

lang-agenda.md

@@ -1,139 +0,0 @@
----
-title: Triage meeting DATE
-tags: triage-meeting
----
-
-# T-lang meeting agenda
-
-* Meeting date: DATE
-
-## Attendance
-
-* Team members:
-* Others:
-
-## Meeting roles
-
-* Action item scribe:
-* Note-taker:
-
-## Scheduled meetings
--  "Rust language "guiding principles"" [lang-team#91](https://github.com/rust-lang/lang-team/issues/91)
--  "Generators planning" [lang-team#92](https://github.com/rust-lang/lang-team/issues/92)
--  "May updates" [lang-team#93](https://github.com/rust-lang/lang-team/issues/93)
-
-## Action item review
-
-* [Action items list](https://hackmd.io/gstfhtXYTHa3Jv-P_2RK7A)
-
-## Pending proposals
-### "MCP: Allowing the compiler to eagerly drop values" lang-team#86
-
-**Link:** https://github.com/rust-lang/lang-team/issues/86
-
-
-
-## Nominated RFCs
-### "RFC: Overconstraining and omitting `unsafe` in impls of `unsafe` trait methods" rfcs#2316
-
-**Link:** https://github.com/rust-lang/rfcs/pull/2316
-
-### "Calling methods on generic parameters of const fns" rfcs#2632
-
-**Link:** https://github.com/rust-lang/rfcs/pull/2632
-
-
-
-## P-high issues on rust-lang/rust
-### "`fn() -> Out` is a valid type for unsized types `Out`, and it implements `FnOnce<(), Output = Out>`" rust#82633
-
-**Link:** https://github.com/rust-lang/rust/issues/82633
-
-### "Closures are unsound: 'static closures with non-'static return types." rust#84366
-
-**Link:** https://github.com/rust-lang/rust/issues/84366
-
-### "Functions, closures, and HRTB-trait-objects can implement traits such that validity of associated types is never checked." rust#84533
-
-**Link:** https://github.com/rust-lang/rust/issues/84533
-
-### "HRTBs are unsound: HRTB on subtrait provides HTRB on supertrait with weaker implied bounds." rust#84591
-
-**Link:** https://github.com/rust-lang/rust/issues/84591
-
-### "A `Pin` unsoundness involving an `impl DerefMut for Pin<&dyn LocalTrait>`" rust#85099
-
-**Link:** https://github.com/rust-lang/rust/issues/85099
-
-
-
-## Nominated PRs and issues
-### "Tracking issue for RFC 2523, `#[cfg(version(..))]`" rust#64796
-
-**Link:** https://github.com/rust-lang/rust/issues/64796
-
-### "Stabilize "RangeFrom" patterns" rust#83918
-
-**Link:** https://github.com/rust-lang/rust/pull/83918
-
-### "Uplift the invalid_atomic_ordering lint from clippy to rustc" rust#84039
-
-**Link:** https://github.com/rust-lang/rust/pull/84039
-
-### "Deny float matches" rust#84045
-
-**Link:** https://github.com/rust-lang/rust/pull/84045
-
-### "ICE when reifying function pointers to copy / copy_nonoverlapping using an if" rust#84297
-
-**Link:** https://github.com/rust-lang/rust/issues/84297
-
-### "Add `expr202x` macro pattern" rust#84364
-
-**Link:** https://github.com/rust-lang/rust/pull/84364
-
-### "Allow struct and enum to contain inner attrs" rust#84414
-
-**Link:** https://github.com/rust-lang/rust/pull/84414
-
-### "stabilize member constraints" rust#84701
-
-**Link:** https://github.com/rust-lang/rust/pull/84701
-
-### "implement `Default` for all arrays" rust#84838
-
-**Link:** https://github.com/rust-lang/rust/pull/84838
-
-### "add back support for inner attributes on non-block expressions?" rust#84879
-
-**Link:** https://github.com/rust-lang/rust/issues/84879
-
-### "rustc: Allow safe #[target_feature] on wasm" rust#84988
-
-**Link:** https://github.com/rust-lang/rust/pull/84988
-
-### "Re-add support for parsing (and pretty-printing) inner-attributes in match body" rust#85193
-
-**Link:** https://github.com/rust-lang/rust/pull/85193
-
-### "Stabilize RFC 2345: Allow panicking in constants" rust#85194
-
-**Link:** https://github.com/rust-lang/rust/issues/85194
-
-### "Ignore derived Clone and Debug implementations during dead code analysis" rust#85200
-
-**Link:** https://github.com/rust-lang/rust/pull/85200
-
-### "Check for union field accesses in THIR unsafeck" rust#85263
-
-**Link:** https://github.com/rust-lang/rust/pull/85263
-
-### "RFC: Overconstraining and omitting `unsafe` in impls of `unsafe` trait methods" rfcs#2316
-
-**Link:** https://github.com/rust-lang/rfcs/pull/2316
-
-### "Calling methods on generic parameters of const fns" rfcs#2632
-
-**Link:** https://github.com/rust-lang/rfcs/pull/2632
-
-

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,
     })
 }

templates/_issues_heading.tt

@@ -6,6 +6,8 @@
 
 **Link:** {{issue.html_url}}
 {%else%}
-{{empty}}
+
+None.
+
 {%endfor%}
 {% endmacro %}

templates/lang_agenda.tt

@@ -27,18 +27,32 @@ 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)}}
+
+## Finished FCPs
+
+{{-issues_heading::render(issues=finished_fcp)}}
+
+## P-critical issues
+
+{{-issues_heading::render(issues=p_critical)}}
+
+## Nominated RFCs, PRs and issues
+
+{{-issues_heading::render(issues=nominated)}}