Merge pull request #429 from rust-lang/2026-updates-rexeg

Use the new regex timespan format everywhere

Author: nikomatsakis

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

@@ -1,6 +1,7 @@
 use regex::Regex;
 use rust_project_goals::spanned::{Error, Spanned};
 use rust_project_goals::{spanned::Context as _, spanned::Result};
+use rust_project_goals::util::MILESTONE_REGEX;
 use std::fs::{self, File};
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -9,6 +10,8 @@ use std::path::{Path, PathBuf};
 pub mod text_processing {
     use regex::Regex;
 
+    use super::MILESTONE_REGEX;
+
     use crate::cfp::normalize_timeframe;
 
     /// Process template content by replacing placeholders and removing notes
@@ -143,7 +146,7 @@ pub mod text_processing {
         // Find a good place to insert the new section
         // Look for the last timeframe section or insert after # Summary
         // Match both year-only (2027) and half-year (2026H1) formats
-        let re = Regex::new(r"# ⏳ \d{4}([hH][12])? goal process").unwrap();
+        let re = Regex::new(&format!(r"# ⏳ {MILESTONE_REGEX} goal process")).unwrap();
 
         if let Some(last_match) = re.find_iter(&content).last() {
             // Find the end of this section (next section or end of file)
@@ -371,7 +374,7 @@ pub fn create_cfp(timeframe: &str, force: bool, dry_run: bool) -> Result<()> {
 
 /// Validates that the timeframe is in the correct format (e.g., "2025h1" or "2025H1" or '2026')
 fn validate_timeframe(timeframe: &str) -> Result<()> {
-    let re = Regex::new(r"^\d{4}([hH][12])?$").unwrap();
+    let re = Regex::new(MILESTONE_REGEX).unwrap();
     if !re.is_match(timeframe) {
         return Err(Error::str("Invalid timeframe format. Expected format: YYYYhN or YYYYHN (e.g., 2025h1, 2025H1, 2025h2, or 2025H2"));
     }

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

@@ -2,7 +2,7 @@ use chrono::{Datelike, NaiveDate};
 use regex::Regex;
 use rust_project_goals::re::{HELP_WANTED, TLDR};
 use rust_project_goals::spanned::{Result, Span, Spanned};
-use rust_project_goals::util::comma;
+use rust_project_goals::util::{comma, MILESTONE_REGEX};
 use rust_project_goals::{goal, markwaydown, spanned, team};
 use rust_project_goals_json::GithubIssueState;
 use std::path::PathBuf;
@@ -39,7 +39,7 @@ pub fn render_updates(
     use_progress_bar: bool,
     comment_order: Order,
 ) -> Result<String> {
-    let milestone_re = Regex::new(r"^\d{4}[hH][12]$").unwrap();
+    let milestone_re = Regex::new(MILESTONE_REGEX).unwrap();
     if !milestone_re.is_match(milestone) {
         spanned::bail_here!(
             "the milestone `{}` does not follow the `$year$semester` format, where $semester is `h1` or `h2`",

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

@@ -9,6 +9,8 @@ use walkdir::WalkDir;
 
 pub const ARROW: &str = "↳";
 
+pub const MILESTONE_REGEX: &'static str = r"^\d{4}([hH][12])?$";
+
 /// Formats a table as markdown. The input should be a series of rows
 /// where each row has the same number of columns.
 /// The first row is the headers.