Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions crates/rust-project-goals-cli/src/rfc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use rust_project_goals::{
labels::GhLabel,
},
goal::{self, GoalDocument, GoalPlan, ParsedOwners},
spanned::{self, Context, Error, Result},
spanned::{self, Context, Error, Result, Spanned},
team::{get_person_data, TeamName},
};

Expand Down Expand Up @@ -301,7 +301,15 @@ fn initialize_issues<'doc>(
Some(issue.clone())
} else {
// If not, load its information from the repository by number.
Some(fetch_issue(repository, tracking_issue.number)?)
let existing_issue =
fetch_issue(repository, tracking_issue.number).map_err(|e| {
e.wrap_str(Spanned::here(format!(
"error while fetching declared tracking issue {} for goal {}",
tracking_issue.number,
desired_issue.goal_document.path.display(),
)))
})?;
Some(existing_issue)
}
} else {
// b. If the markdown does not have a declared tracking issue, then we can search through
Expand Down
9 changes: 9 additions & 0 deletions crates/rust-project-goals/src/gh/issues.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ pub fn fetch_issue(repository: &Repository, issue: u64) -> Result<ExistingGithub
.arg("title,assignees,number,comments,body,state,labels,milestone")
.output()?;

if !output.status.success() {
spanned::bail_here!(
"fetching `{}` issue {} failed: {}",
repository.to_string(),
issue,
String::from_utf8_lossy(&output.stderr)
);
}

let e_i: ExistingGithubIssueJson = serde_json::from_slice(&output.stdout)?;

Ok(ExistingGithubIssue::from(e_i))
Expand Down
9 changes: 9 additions & 0 deletions crates/rust-project-goals/src/goal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,15 @@ fn extract_metadata(sections: &[Section]) -> Result<Option<Metadata>> {
spanned::bail!(r[1], "accepted goals cannot have an empty tracking issue");
}

if has_tracking_issue && !r[1].contains("rust-project-goals#") {
spanned::bail!(
r[1],
"tracking issues are issues in the rust-project-goals repository. \
The `{}` issue can go in the `Other tracking issues` row.",
r[1].as_str(),
);
}

// For the others, it's of course optional.
if has_tracking_issue {
Some(r[1].parse()?.content)
Expand Down
14 changes: 7 additions & 7 deletions src/2025h2/delegation.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Delegation

| Metadata | |
| :------------------ | :---------------------- |
| Point of contact | @petrochenkov |
| Status | Not accepted |
| Zulip channel | N/A |
| Tracking issue | [rust-lang/rust#118212] |
| [compiler] champion | @petrochenkov |
| Metadata | |
| :-------------------- | :---------------------- |
| Point of contact | @petrochenkov |
| Status | Not accepted |
| Zulip channel | N/A |
| Other tracking issues | [rust-lang/rust#118212] |
| [compiler] champion | @petrochenkov |

## Summary

Expand Down
2 changes: 1 addition & 1 deletion src/2025h2/gcc-backend-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
|:-----------------|------------------------------------------------|
| Point of contact | @GuillaumeGomez |
| Status | Proposed |
| Tracking issue | [rust-lang/compiler-team#891] |
| Other tracking issues | [rust-lang/compiler-team#891] |
| Zulip channel | [#rustc-codegen-gcc][rustc-codegen-gcc] |
| [compiler] champion | @WesleyWiser |
| [infra] champion | @marcoieni |
Expand Down
2 changes: 1 addition & 1 deletion src/2025h2/rustdoc-doc-cfg.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
|:-----------------|------------------------------------------------|
| Point of contact | @GuillaumeGomez |
| Status | Proposed |
| Tracking issue | [rust-lang/rust#43781] |
| Other tracking issues | [rust-lang/rust#43781] |
| Zulip channel | [#t-rustdoc][t-rustdoc] |
| [rustdoc] champion | @GuillaumeGomez |
[t-rustdoc]: https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc
Expand Down