factor out jason crate, cargo fmt

Author: Niko Matsakis

Cargo.lock

@@ -1,6 +1,6 @@
 
 [workspace]
-members = ["crates/mdbook-goals", "crates/rust-project-goals", "crates/rust-project-goals-cli", "crates/rust-project-goals-cli-llm", "crates/rust-project-goals-llm"]
+members = ["crates/mdbook-goals", "crates/rust-project-goals", "crates/rust-project-goals-cli", "crates/rust-project-goals-cli-llm", "crates/rust-project-goals-json", "crates/rust-project-goals-llm"]
 resolver = "2"
 
 [profile.dev]

Cargo.toml

@@ -18,7 +18,6 @@ struct Opt {
 enum Command {
     /// Command used by mdbook to check if the preprocessor supports a renderer
     Supports { renderer: String },
-
 }
 
 fn main() -> anyhow::Result<()> {

crates/mdbook-goals/src/main.rs

@@ -10,7 +10,10 @@ use mdbook::BookItem;
 use regex::{Captures, Regex};
 use rust_project_goals::util::GithubUserInfo;
 
-use rust_project_goals::{re, team, goal::{self, format_team_asks, GoalDocument, Status, TeamAsk}};
+use rust_project_goals::{
+    goal::{self, format_team_asks, GoalDocument, Status, TeamAsk},
+    re, team,
+};
 
 const LINKS: &str = "links";
 const LINKIFIERS: &str = "linkifiers";

crates/mdbook-goals/src/mdbook_preprocessor.rs

@@ -18,3 +18,4 @@ serde_json = "1.0.133"
 comrak = "0.31.0"
 progress_bar = "1.0.6"
 tokio = { version = "1.42.0", features = ["full"] }
+rust-project-goals-json = { version = "0.1.0", path = "../rust-project-goals-json" }

crates/rust-project-goals-cli-llm/Cargo.toml

@@ -1,4 +1,3 @@
-
 use anyhow::Context;
 use aws_config::{
     environment::EnvironmentVariableCredentialsProvider,

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

@@ -12,15 +12,37 @@ mod updates;
 #[derive(clap::Parser, Debug)]
 #[structopt(about = "Project goal preprocessor")]
 struct Opt {
-    repository: Repository,    
+    repository: Repository,
     updates_json: String,
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let Opt { repository, updates_json } = Opt::parse();
-    let UpdateArgs { milestone, quick, vscode, output_file, start_date, end_date, model_id, region } = 
-    &serde_json::from_str(&updates_json)?;
-    updates::updates(&repository, milestone, output_file.as_deref(), start_date, end_date, *quick, *vscode, model_id.as_deref(), region.as_deref()).await?;
+    let Opt {
+        repository,
+        updates_json,
+    } = Opt::parse();
+    let UpdateArgs {
+        milestone,
+        quick,
+        vscode,
+        output_file,
+        start_date,
+        end_date,
+        model_id,
+        region,
+    } = &serde_json::from_str(&updates_json)?;
+    updates::updates(
+        &repository,
+        milestone,
+        output_file.as_deref(),
+        start_date,
+        end_date,
+        *quick,
+        *vscode,
+        model_id.as_deref(),
+        region.as_deref(),
+    )
+    .await?;
     Ok(())
-}
+}

crates/rust-project-goals-cli-llm/src/main.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use handlebars::{DirectorySourceOptions, Handlebars};
 use serde::Serialize;
 
-use rust_project_goals::json::Progress;
+use rust_project_goals_json::Progress;
 
 pub struct Templates<'h> {
     reg: Handlebars<'h>,

crates/rust-project-goals-cli-llm/src/templates.rs

@@ -1,19 +1,19 @@
 use anyhow::Context;
 use chrono::{Datelike, NaiveDate};
-use rust_project_goals::json::GithubIssueState;
+use rust_project_goals::util::comma;
+use rust_project_goals_json::GithubIssueState;
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::path::Path;
 use std::process::{Command, Stdio};
-use rust_project_goals::util::comma;
 
+use crate::llm::LargeLanguageModel;
+use crate::templates::{self, Updates, UpdatesGoal};
+use rust_project_goals::gh::issues::ExistingGithubIssue;
 use rust_project_goals::gh::{
     issue_id::{IssueId, Repository},
-    issues::{list_issue_titles_in_milestone, ExistingGithubComment, checkboxes},
+    issues::{checkboxes, list_issue_titles_in_milestone, ExistingGithubComment},
 };
-use rust_project_goals::gh::issues::ExistingGithubIssue;
-use crate::llm::LargeLanguageModel;
-use crate::templates::{self, Updates, UpdatesGoal};
 
 const QUICK_UPDATES: &[&str] = &[
     "Jack and Jill went up the hill",

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

@@ -15,3 +15,4 @@ serde_json = "1.0.133"
 chrono = "0.4.39"
 progress_bar = "1.0.6"
 clap = { version = "4.5.23", features = ["derive"] }
+rust-project-goals-json = { version = "0.1.0", path = "../rust-project-goals-json" }

crates/rust-project-goals-cli/Cargo.toml

@@ -1,6 +1,10 @@
 use std::path::PathBuf;
 
-use rust_project_goals::{gh::{issue_id::Repository, issues::{checkboxes, list_issue_titles_in_milestone, ExistingGithubComment}}, json::{ TrackingIssue, TrackingIssueUpdate, TrackingIssues}};
+use rust_project_goals::gh::{
+    issue_id::Repository,
+    issues::{checkboxes, list_issue_titles_in_milestone, ExistingGithubComment},
+};
+use rust_project_goals_json::{TrackingIssue, TrackingIssueUpdate, TrackingIssues};
 
 pub(super) fn generate_json(
     repository: &Repository,

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

@@ -1,13 +1,13 @@
 use anyhow::{bail, Context};
 use clap::Parser;
 use regex::Regex;
+use rust_project_goals::gh::issue_id::Repository;
 use rust_project_goals_llm::UpdateArgs;
 use std::path::PathBuf;
 use walkdir::WalkDir;
-use rust_project_goals::gh::issue_id::Repository;
 
-mod rfc;
 mod generate_json;
+mod rfc;
 mod team_repo;
 
 #[derive(clap::Parser, Debug)]
@@ -74,7 +74,7 @@ enum Command {
     /// Collects updates
     Updates {
         #[command(flatten)]
-        updates: UpdateArgs
+        updates: UpdateArgs,
     },
 }
 
@@ -116,18 +116,18 @@ fn main() -> anyhow::Result<()> {
         } => {
             generate_json::generate_json(&opt.repository, &milestone, json_path)?;
         }
-        Command::Updates {updates } => {
+        Command::Updates { updates } => {
             // The updates command is compiled separately so that we don't have to
             // build all the LLM stuff if we are not using it.
             let status = std::process::Command::new("cargo")
-            .arg("run")
-            .arg("-p")
-            .arg("rust-project-goals-cli-llm")
-            .arg("-q")
-            .arg("--")
-            .arg(&opt.repository.to_string())
-            .arg(&serde_json::to_string(updates).unwrap())
-            .status()?;
+                .arg("run")
+                .arg("-p")
+                .arg("rust-project-goals-cli-llm")
+                .arg("-q")
+                .arg("--")
+                .arg(&opt.repository.to_string())
+                .arg(&serde_json::to_string(updates).unwrap())
+                .status()?;
             if !status.success() {
                 bail!("subcommand failed");
             }

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

@@ -12,7 +12,10 @@ use regex::Regex;
 use rust_project_goals::{
     gh::{
         issue_id::{IssueId, Repository},
-        issues::{create_issue, list_issue_titles_in_milestone, lock_issue, sync_assignees, FLAGSHIP_LABEL},
+        issues::{
+            create_issue, list_issue_titles_in_milestone, lock_issue, sync_assignees,
+            FLAGSHIP_LABEL,
+        },
         labels::GhLabel,
     },
     goal::{self, GoalDocument, ParsedOwners, PlanItem, Status},

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

@@ -0,0 +1,7 @@
+[package]
+name = "rust-project-goals-json"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0.216", features = ["derive"] }

crates/rust-project-goals-json/Cargo.toml

@@ -1,5 +1,3 @@
-//! Generate JSON summarizing the tracking issues.
-//!
 //! This module contains types (e.g., [`TrackingIssues`]) that represent the
 //! external API that is used by the website
 //! and other tools to consume the tracking issue data. They are very similar

crates/rust-project-goals/src/json.rs renamed to crates/rust-project-goals-json/src/lib.rs

@@ -3,39 +3,39 @@
 
 use std::path::PathBuf;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 /// Updates struct
 #[derive(clap::Args, Debug, Serialize, Deserialize)]
 pub struct UpdateArgs {
-      /// Milestone for which we generate tracking issue data (e.g., `2024h2`).
-      pub milestone: String,
+    /// Milestone for which we generate tracking issue data (e.g., `2024h2`).
+    pub milestone: String,
 
-      /// Quick mode does not use an LLM to generate a summary.
-      #[arg(long)]
-      pub quick: bool,
+    /// Quick mode does not use an LLM to generate a summary.
+    #[arg(long)]
+    pub quick: bool,
 
-      /// Quick mode does not use an LLM to generate a summary.
-      #[arg(long)]
-      pub vscode: bool,
+    /// Quick mode does not use an LLM to generate a summary.
+    #[arg(long)]
+    pub vscode: bool,
 
-      /// If specified, write the output into the given file.
-      #[arg(long)]
-      pub output_file: Option<PathBuf>,
+    /// If specified, write the output into the given file.
+    #[arg(long)]
+    pub output_file: Option<PathBuf>,
 
-      /// Start date for comments.
-      /// If not given, defaults to 1 week before the start of this month.
-      pub start_date: Option<chrono::NaiveDate>,
+    /// Start date for comments.
+    /// If not given, defaults to 1 week before the start of this month.
+    pub start_date: Option<chrono::NaiveDate>,
 
-      /// End date for comments.
-      /// If not given, no end date.
-      pub end_date: Option<chrono::NaiveDate>,
+    /// End date for comments.
+    /// If not given, no end date.
+    pub end_date: Option<chrono::NaiveDate>,
 
-      /// Set a custom model id for the LLM.
-      #[arg(long)]
-      pub model_id: Option<String>,
+    /// Set a custom model id for the LLM.
+    #[arg(long)]
+    pub model_id: Option<String>,
 
-      /// Set a custom region.
-      #[arg(long)]
-      pub region: Option<String>,
-}
+    /// Set a custom region.
+    #[arg(long)]
+    pub region: Option<String>,
+}

crates/rust-project-goals-llm/src/lib.rs

@@ -14,3 +14,4 @@ serde = "1.0.216"
 serde_json = "1.0.133"
 walkdir = "2.5.0"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
+rust-project-goals-json = { version = "0.1.0", path = "../rust-project-goals-json" }

crates/rust-project-goals/Cargo.toml

@@ -1,13 +1,15 @@
 use std::{
     collections::{BTreeMap, BTreeSet},
-    process::Command, str::FromStr,
+    process::Command,
+    str::FromStr,
 };
 
 use anyhow::Context;
 use chrono::NaiveDate;
+use rust_project_goals_json::{GithubIssueState, Progress};
 use serde::{Deserialize, Serialize};
 
-use crate::{json::{GithubIssueState, Progress}, re, util::comma};
+use crate::{re, util::comma};
 
 use super::{issue_id::Repository, labels::GhLabel};
 

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

@@ -7,10 +7,10 @@ use anyhow::Context;
 use regex::Regex;
 
 use crate::gh::issue_id::{IssueId, Repository};
+use crate::markwaydown::{self, Section, Table};
 use crate::re::USERNAME;
 use crate::team::{self, TeamName};
 use crate::util::{self, commas, markdown_files, ARROW};
-use crate::markwaydown::{self, Section, Table};
 
 /// Data parsed from a goal file in the expected format
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -231,7 +231,7 @@ pub fn format_team_asks(asks_of_any_team: &[&TeamAsk]) -> anyhow::Result<String>
 pub fn format_goal_table(goals: &[&GoalDocument]) -> anyhow::Result<String> {
     // If any of the goals have tracking issues, include those in the table.
     let goals_are_proposed = goals.iter().any(|g| g.metadata.status == Status::Proposed);
-    
+
     let mut table;
 
     if !goals_are_proposed {

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

@@ -1,7 +1,6 @@
-pub mod util;
-pub mod markwaydown;
 pub mod gh;
-pub mod json;
+pub mod goal;
+pub mod markwaydown;
 pub mod re;
 pub mod team;
-pub mod goal;
+pub mod util;