Use new spanned diagnostics

Author: oli-obk

Cargo.lock

@@ -11,4 +11,3 @@ regex = "1.11.1"
 rust-project-goals = { version = "0.1.0", path = "../rust-project-goals" }
 semver = "1.0.23"
 serde_json = "1.0.133"
-spanned = "0.4.0"

crates/mdbook-goals/Cargo.toml

@@ -12,11 +12,11 @@ use rust_project_goals::config::Configuration;
 use rust_project_goals::format_team_ask::format_team_asks;
 use rust_project_goals::util::{self, GithubUserInfo};
 
+use rust_project_goals::spanned::Spanned;
 use rust_project_goals::{
     goal::{self, GoalDocument, Status, TeamAsk},
     re, team,
 };
-use spanned::Spanned;
 
 const LINKS: &str = "links";
 const LINKIFIERS: &str = "linkifiers";

crates/mdbook-goals/src/mdbook_preprocessor.rs

@@ -16,4 +16,3 @@ clap = { version = "4.5.23", features = ["derive"] }
 rust-project-goals-json = { version = "0.1.0", path = "../rust-project-goals-json" }
 handlebars = { version = "6.2.0", features = ["dir_source"] }
 comrak = "0.31.0"
-spanned = "0.4.0"

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

@@ -3,9 +3,9 @@ use chrono::{Datelike, NaiveDate};
 use regex::Regex;
 use rust_project_goals::markwaydown;
 use rust_project_goals::re::{HELP_WANTED, TLDR};
+use rust_project_goals::spanned::{Span, Spanned};
 use rust_project_goals::util::comma;
 use rust_project_goals_json::GithubIssueState;
-use spanned::{Span, Spanned};
 use std::io::Write;
 use std::path::Path;
 use std::process::{Command, Stdio};

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

@@ -16,4 +16,4 @@ rust_team_data = { git = "https://github.com/rust-lang/team" }
 rust-project-goals-json = { version = "0.1.0", path = "../rust-project-goals-json" }
 toml = "0.8.19"
 indexmap = "2.7.1"
-spanned = "0.4.0"
+spanned = "0.5.0"

crates/rust-project-goals/Cargo.toml

@@ -409,8 +409,8 @@ fn extract_metadata(sections: &[Section]) -> anyhow::Result<Option<Metadata>> {
 
     if !re::is_just(&re::USERNAME, poc_row[1].trim()) {
         anyhow::bail!(
-            "point of contact must be a single github username (found {})",
-            poc_row[1].render()
+            "point of contact must be a single github username (found {:?})",
+            poc_row[1]
         )
     }
 
@@ -538,8 +538,8 @@ fn goal_plan(
             }))
         }
         _ => anyhow::bail!(
-            "multiple goal tables found in section `{}`",
-            section.title.render()
+            "multiple goal tables found in section `{:?}`",
+            section.title
         ),
     }
 }
@@ -678,8 +678,8 @@ fn expect_headers(table: &Table, expected: &[&str]) -> anyhow::Result<()> {
     if table.header != expected {
         // FIXME: do a diff so we see which headers are missing or extraneous
         anyhow::bail!(
-            "{}: unexpected table header, expected `{:?}`, found `{:?}`",
-            table.header[0].render(),
+            "{:?}: unexpected table header, expected `{:?}`, found `{:?}`",
+            table.header[0],
             expected,
             table.header.iter().map(|h| &h.content),
         );

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

@@ -6,3 +6,4 @@ pub mod markwaydown;
 pub mod re;
 pub mod team;
 pub mod util;
+pub use spanned;

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

@@ -32,7 +32,7 @@ pub struct Table {
 pub fn parse(path: impl AsRef<Path>) -> anyhow::Result<Vec<Section>> {
     let path = path.as_ref();
     let text = Spanned::read_str_from_file(path).transpose()?;
-    parse_text(text.as_ref())
+    parse_text(text.as_ref().map(|s| s.as_ref()))
 }
 
 pub fn parse_text(text: Spanned<&str>) -> anyhow::Result<Vec<Section>> {