create issues for 2025h2 project goals (#417)

* add tracking issue for trait goal

* update goals with tracking issues

* fix bug when the number of labels>32

* Fix infinite loop when multiple goals share same tracking issue

- Add maximum iteration limit (10) to prevent infinite loops
- Add validation to detect and report duplicate tracking issues
- Provide clear error message when duplicate tracking issues are found

Co-authored-by: Claude <[email protected]>

* fix table rewrite within the file

The span for the table needs to be the full span
and we need to take a `Spanned<Table>`.

I wonder what this will break that I'm not
thinking of!

* make github command more resilient

---------

Co-authored-by: Claude <[email protected]>

Author: nikomatsakis

crates/rust-project-goals-cli/src/rfc.rs

@@ -112,7 +112,18 @@ pub fn generate_issues(
 
     // Hacky but works: we loop because after creating the issue, we sometimes have additional sync to do,
     // and it's easier this way.
+    let mut iteration_count = 0;
+    const MAX_ITERATIONS: usize = 10;
+
     loop {
+        iteration_count += 1;
+        if iteration_count > MAX_ITERATIONS {
+            spanned::bail_here!(
+                "Fixed point iteration failed to converge after {} iterations. \
+                 This may indicate duplicate tracking issues assigned to multiple goals.",
+                MAX_ITERATIONS
+            );
+        }
         let timeframe = validate_path(path)?;
 
         let mut goal_documents = goal::goals_in_dir(path)?;
@@ -168,6 +179,9 @@ pub fn generate_issues(
             eprintln!("Use `--commit` to execute the actions.");
             return Ok(());
         }
+
+        eprintln!("Waiting for github commands to propagate.");
+        std::thread::sleep(Duration::from_millis(1000));
     }
 }
 
@@ -221,11 +235,6 @@ enum GithubAction<'doc> {
     LockIssue {
         number: u64,
     },
-
-    LinkToTrackingIssue {
-        goal_document: &'doc GoalDocument,
-        issue_id: IssueId,
-    },
 }
 
 /// Initializes the required `T-<team>` labels on the repository.
@@ -281,6 +290,35 @@ fn initialize_issues<'doc>(
         .map(|goal_document| issue(timeframe, goal_document))
         .collect::<Result<_>>()?;
 
+    // Check for duplicate tracking issues
+    let mut tracking_issue_counts = std::collections::HashMap::new();
+    for issue in &desired_issues {
+        if let Some(tracking_issue) = issue.tracking_issue {
+            let count = tracking_issue_counts
+                .entry(tracking_issue.number)
+                .or_insert(0);
+            *count += 1;
+        }
+    }
+
+    for (issue_number, count) in tracking_issue_counts {
+        if count > 1 {
+            let goals_with_issue: Vec<_> = desired_issues
+                .iter()
+                .filter(|issue| issue.tracking_issue.map(|ti| ti.number) == Some(issue_number))
+                .map(|issue| issue.goal_document.path.display().to_string())
+                .collect();
+
+            spanned::bail_here!(
+                "Tracking issue #{} is assigned to {} goals: {}. \
+                 Each tracking issue can only be assigned to one goal.",
+                issue_number,
+                count,
+                goals_with_issue.join(", ")
+            );
+        }
+    }
+
     // the list of existing issues in the target milestone
     let milestone_issues = list_issues_in_milestone(repository, timeframe)?;
 
@@ -390,14 +428,6 @@ fn initialize_issues<'doc>(
                         body,
                     });
                 }
-
-                let issue_id = IssueId::new(repository.clone(), existing_issue.number);
-                if desired_issue.tracking_issue != Some(&issue_id) {
-                    actions.insert(GithubAction::LinkToTrackingIssue {
-                        goal_document: desired_issue.goal_document,
-                        issue_id,
-                    });
-                }
             }
 
             None => {
@@ -534,7 +564,7 @@ impl Display for GithubAction<'_> {
                 write!(f, "create label `{}` with color `{}`", name, color)
             }
             GithubAction::CreateIssue { issue } => {
-                write!(f, "create issue \"{}\"", issue.title)
+                write!(f, "create issue \"{}\"", issue.title,)
             }
             GithubAction::ChangeMilestone { number, milestone } => {
                 write!(f, "update issue #{} milestone to \"{}\"", number, milestone)
@@ -568,16 +598,6 @@ impl Display for GithubAction<'_> {
             GithubAction::LockIssue { number } => {
                 write!(f, "lock issue #{}", number)
             }
-            GithubAction::LinkToTrackingIssue {
-                goal_document,
-                issue_id,
-            } => {
-                write!(
-                    f,
-                    "link issue {issue_id:?} to the markdown document at {}",
-                    goal_document.path.display()
-                )
-            }
         }
     }
 }
@@ -598,12 +618,13 @@ impl GithubAction<'_> {
                         body,
                         labels,
                         tracking_issue: _,
-                        goal_document: _,
+                        goal_document,
                     },
             } => {
-                create_issue(repository, &body, &title, &labels, &assignees, timeframe)?;
+                let issue_id =
+                    create_issue(repository, &body, &title, &labels, &assignees, timeframe)?;
 
-                // Note: the issue is not locked, but we will reloop around later.
+                goal_document.link_issue(issue_id)?;
 
                 Ok(())
             }
@@ -640,11 +661,6 @@ impl GithubAction<'_> {
             }
 
             GithubAction::LockIssue { number } => lock_issue(repository, number),
-
-            GithubAction::LinkToTrackingIssue {
-                goal_document,
-                issue_id: number,
-            } => goal_document.link_issue(number),
         }
     }
 }

crates/rust-project-goals/src/gh/issue_id.rs

@@ -1,4 +1,4 @@
-use crate::re::{REPOSITORY, TRACKING_ISSUE};
+use crate::re::{GITHUB_ISSUE_URL, REPOSITORY, TRACKING_ISSUE};
 use std::fmt::Display;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Debug)]
@@ -58,6 +58,17 @@ impl IssueId {
         } = self;
         format!("https://github.com/{org}/{repo}/issues/{number}")
     }
+
+    pub fn from_url(url: &str) -> Option<Self> {
+        let Some(c) = GITHUB_ISSUE_URL.captures(url) else {
+            return None;
+        };
+
+        let repository = Repository::new(&c[1], &c[2]);
+        let number = c[3].parse().unwrap();
+
+        Some(IssueId::new(repository, number))
+    }
 }
 
 impl std::fmt::Debug for IssueId {

crates/rust-project-goals/src/gh/issues.rs

@@ -5,7 +5,7 @@ use rust_project_goals_json::{GithubIssueState, Progress};
 use serde::{Deserialize, Serialize};
 use spanned::{Context, Error, Result};
 
-use crate::{re, util::comma};
+use crate::{gh::issue_id::IssueId, re, util::comma};
 
 use super::{issue_id::Repository, labels::GhLabel, milestone::GhMilestone};
 
@@ -174,7 +174,7 @@ pub fn create_issue(
     labels: &[String],
     assignees: &BTreeSet<String>,
     milestone: &str,
-) -> Result<()> {
+) -> Result<IssueId> {
     let output = Command::new("gh")
         .arg("-R")
         .arg(&repository.to_string())
@@ -193,14 +193,24 @@ pub fn create_issue(
         .output()?;
 
     if !output.status.success() {
-        Err(Error::str(format!(
+        return Err(Error::str(format!(
             "failed to create issue `{}`: {}",
             title,
             String::from_utf8_lossy(&output.stderr)
-        )))
-    } else {
-        Ok(())
+        )));
     }
+
+    // Output in stdout looks like
+    //
+    // https://github.com/rust-lang/rust-project-goals/issues/413}
+
+    for line in str::from_utf8(&output.stdout)?.lines() {
+        if let Some(issue_id) = IssueId::from_url(line.trim()) {
+            return Ok(issue_id);
+        }
+    }
+
+    Err(Error::str(format!("creating issue did not return a URL")))
 }
 
 pub fn change_title(repository: &Repository, number: u64, title: &str) -> Result<()> {

crates/rust-project-goals/src/gh/labels.rs

@@ -13,18 +13,30 @@ pub struct GhLabel {
 
 impl GhLabel {
     pub fn list(repository: &Repository) -> Result<Vec<GhLabel>> {
-        let output = Command::new("gh")
-            .arg("-R")
-            .arg(&repository.to_string())
-            .arg("label")
-            .arg("list")
-            .arg("--json")
-            .arg("name,color")
-            .output()?;
+        let mut limit = 128;
+
+        loop {
+            let output = Command::new("gh")
+                .arg("-R")
+                .arg(&repository.to_string())
+                .arg("label")
+                .arg("list")
+                .arg("--json")
+                .arg("name,color")
+                .arg("-L")
+                .arg(format!("{limit}"))
+                .output()?;
 
-        let labels: Vec<GhLabel> = serde_json::from_slice(&output.stdout)?;
+            let labels: Vec<GhLabel> = serde_json::from_slice(&output.stdout)?;
+            if labels.len() >= limit {
+                // If we got exactly as many as we asked for,
+                // we might be missing some.
+                limit = limit * 2;
+                continue;
+            }
 
-        Ok(labels)
+            return Ok(labels);
+        }
     }
 
     pub fn create(&self, repository: &Repository) -> Result<()> {

crates/rust-project-goals/src/goal.rs

@@ -194,9 +194,9 @@ impl GoalDocument {
         metadata_table
             .content
             .add_key_value_row(TRACKING_ISSUE_ROW, &number);
-        self.metadata
-            .table
-            .overwrite_in_path(&self.path, &metadata_table)?;
+
+        Table::overwrite_in_path(&self.metadata.table, &self.path, &metadata_table)?;
+
         Ok(())
     }
 

crates/rust-project-goals/src/markwaydown.rs

@@ -79,19 +79,20 @@ pub fn parse_text(text: Spanned<&str>) -> Result<Vec<Section>> {
                         row.push(Spanned::here(String::new()));
                     }
 
+                    table.span.bytes.end = line.span.bytes.end;
                     table.content.rows.push(row);
                 } else {
                     open_table = Some(Spanned::new(
                         Table {
                             header: row,
                             rows: vec![],
                         },
-                        line.span.clone().shrink_to_start(),
+                        line.span.clone(),
                     ));
                 }
             }
             CategorizeLine::TableDashRow(dashes) => {
-                if let Some(table) = &open_table {
+                if let Some(table) = &mut open_table {
                     if table.header.len() != dashes.len() {
                         spanned::bail!(
                             dashes.last().unwrap(),
@@ -108,6 +109,8 @@ pub fn parse_text(text: Spanned<&str>) -> Result<Vec<Section>> {
                         )
                         .wrap_str(first[0].as_ref().map(|_| "already saw table row here")));
                     }
+
+                    table.span.bytes.end = line.span.bytes.end;
                 } else {
                     spanned::bail!(dashes[0], "did not expect table header here",);
                 }
@@ -198,18 +201,25 @@ impl Table {
     }
 
     /// Modify `path` to replace the lines containing this table with `new_table`.
-    pub fn overwrite_in_path(&self, path: &Path, new_table: &Table) -> Result<()> {
+    pub fn overwrite_in_path(this: &Spanned<Self>, path: &Path, new_table: &Table) -> Result<()> {
         let full_text = std::fs::read_to_string(path)?;
+        let table_span = &this.span.bytes;
+
+        let table_text = &full_text[table_span.start..table_span.end];
+        assert!(
+            table_text.starts_with("|") && table_text.ends_with("|"),
+            "table_text doesn't appear to be a table: {table_text:?}"
+        );
 
-        let mut new_text = full_text[..self.header[0].span.bytes.start].to_string();
+        let mut new_text = full_text[..table_span.start].to_string();
 
         let table_text = {
             let mut new_rows = vec![new_table.header.clone()];
             new_rows.extend(new_table.rows.iter().cloned());
             util::format_table(&new_rows)
         };
         new_text.push_str(&table_text);
-        new_text.push_str(&full_text[self.rows.last().unwrap().last().unwrap().span.bytes.end..]);
+        new_text.push_str(&full_text[table_span.end..]);
 
         std::fs::write(path, new_text)?;
 

crates/rust-project-goals/src/re.rs

@@ -67,6 +67,11 @@ lazy_static! {
     pub static ref TRACKING_ISSUE: Regex = Regex::new(r"\[([^#/]*)/([^#/]*)#([0-9]+)\]").unwrap();
 }
 
+lazy_static! {
+    pub static ref GITHUB_ISSUE_URL: Regex =
+        Regex::new(r"https://github.com/([^#/]*)/([^#/]*)/issues/([0-9]+)").unwrap();
+}
+
 lazy_static! {
     pub static ref CHECKBOX: Regex = Regex::new(r"\s*[-*] \[[ x]\] ").unwrap();
 }

src/2025h2/FLS-up-to-date-capabilities.md

@@ -1,14 +1,15 @@
 # Develop the capabilities to keep the FLS up to date
 
-| Metadata         |                                                                                  |
-|:-----------------|----------------------------------------------------------------------------------|
-| Point of contact | @PLeVasseur                                                                      |
-| Status           | Proposed                                                                         |
-| Tracking issue   |                                                                                  |
-| Zulip channel    | #t-spec                                                                          |
-| [bootstrap] champion | @kobzol |
-| [lang] champion | @nikomatsakis |
-| [spec] champion | @PLeVasseur |
+| Metadata             |                                    |
+| :--                  | :--                                |
+| Point of contact     | @PLeVasseur                        |
+| Status               | Proposed                           |
+| Tracking issue       | [rust-lang/rust-project-goals#391] |
+| Zulip channel        | #t-spec                            |
+| [bootstrap] champion | @kobzol                            |
+| [lang] champion      | @nikomatsakis                      |
+| [spec] champion      | @PLeVasseur                        |
+
 
 ## Summary