Fix rustfmt formatting in handlers submodules and templates
https://claude.ai/code/session_01URZjpNNXYVjq99E1msKw1J
diff --git a/quire-server/src/quire/web/handlers/ci.rs b/quire-server/src/quire/web/handlers/ci.rs
index d640a7f..815657f 100644
--- a/quire-server/src/quire/web/handlers/ci.rs
+++ b/quire-server/src/quire/web/handlers/ci.rs
@@ -4,12 +4,12 @@ use axum::extract::{Path as AxumPath, State};
use axum::http::StatusCode;
use axum::response::{IntoResponse, Response};
-use super::git::{read_bookmarks, read_tags};
-use super::{render, render_error};
use super::super::db;
use super::super::templates::{
Crumb, DetailJob, DetailRun, DetailShEvent, RunDetailTemplate, RunListRow, RunListTemplate,
};
+use super::git::{read_bookmarks, read_tags};
+use super::{render, render_error};
use crate::Quire;
pub async fn run_list(State(quire): State<Quire>, AxumPath(repo): AxumPath<String>) -> Response {
diff --git a/quire-server/src/quire/web/handlers/git.rs b/quire-server/src/quire/web/handlers/git.rs
index c077c1b..85af491 100644
--- a/quire-server/src/quire/web/handlers/git.rs
+++ b/quire-server/src/quire/web/handlers/git.rs
@@ -42,7 +42,12 @@ pub(super) fn read_head_info(repo: &Repo) -> Option<HeadInfo> {
let sha = lines.next()?.to_string();
let description = lines.next().unwrap_or("").to_string();
let age = lines.next().unwrap_or("").to_string();
- Some(HeadInfo { sha, description, age, bookmark })
+ Some(HeadInfo {
+ sha,
+ description,
+ age,
+ bookmark,
+ })
}
pub(super) fn read_readme(repo: &Repo) -> Option<String> {
diff --git a/quire-server/src/quire/web/handlers/mod.rs b/quire-server/src/quire/web/handlers/mod.rs
index 422b71b..5b5922a 100644
--- a/quire-server/src/quire/web/handlers/mod.rs
+++ b/quire-server/src/quire/web/handlers/mod.rs
@@ -33,7 +33,12 @@ pub(super) fn render<T: Template>(tmpl: &T) -> Response {
/// Render the error template with the given status, falling back to plain
/// text if the error template itself fails to render.
-pub(super) fn render_error(repo: String, status: StatusCode, title: &str, detail: String) -> Response {
+pub(super) fn render_error(
+ repo: String,
+ status: StatusCode,
+ title: &str,
+ detail: String,
+) -> Response {
let tmpl = ErrorTemplate {
repo,
crumbs: vec![Crumb::new("error")],
@@ -151,7 +156,12 @@ mod tests {
let env = TestEnv::new();
let resp = env
.app()
- .oneshot(Request::builder().uri("/example").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/example")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
@@ -162,7 +172,12 @@ mod tests {
let env = TestEnv::new();
let resp = env
.app()
- .oneshot(Request::builder().uri("/example.git").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/example.git")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
@@ -171,10 +186,23 @@ mod tests {
#[tokio::test]
async fn run_list_returns_ok_for_known_repo() {
let env = TestEnv::new();
- env.insert_run(UUID1, Some("succeeded"), SHA1, "refs/heads/main", 1000, Some(2000), Some(3000));
+ env.insert_run(
+ UUID1,
+ Some("succeeded"),
+ SHA1,
+ "refs/heads/main",
+ 1000,
+ Some(2000),
+ Some(3000),
+ );
let resp = env
.app()
- .oneshot(Request::builder().uri("/example/ci").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/example/ci")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
@@ -185,7 +213,12 @@ mod tests {
let env = TestEnv::new();
let resp = env
.app()
- .oneshot(Request::builder().uri("/nonexistent/ci").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/nonexistent/ci")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
@@ -194,7 +227,15 @@ mod tests {
#[tokio::test]
async fn run_detail_returns_ok_for_existing_run() {
let env = TestEnv::new();
- env.insert_run(UUID1, Some("succeeded"), SHA1, "refs/heads/main", 1000, Some(2000), Some(3000));
+ env.insert_run(
+ UUID1,
+ Some("succeeded"),
+ SHA1,
+ "refs/heads/main",
+ 1000,
+ Some(2000),
+ Some(3000),
+ );
env.insert_job(UUID1, "build", "succeeded", Some(0), Some(2000), Some(3000));
let resp = env
.app()
@@ -214,7 +255,12 @@ mod tests {
let env = TestEnv::new();
let resp = env
.app()
- .oneshot(Request::builder().uri("/example/ci/not-a-uuid").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/example/ci/not-a-uuid")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
@@ -247,7 +293,12 @@ mod tests {
.ok();
let resp = env
.app()
- .oneshot(Request::builder().uri("/example/tree").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/example/tree")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
// Empty repo has no HEAD → 404; populated repo → 200.
@@ -263,7 +314,12 @@ mod tests {
let env = TestEnv::new();
let resp = env
.app()
- .oneshot(Request::builder().uri("/nonexistent/tree").body(Body::empty()).unwrap())
+ .oneshot(
+ Request::builder()
+ .uri("/nonexistent/tree")
+ .body(Body::empty())
+ .unwrap(),
+ )
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
diff --git a/quire-server/src/quire/web/handlers/repo.rs b/quire-server/src/quire/web/handlers/repo.rs
index da6078c..a9e5ff8 100644
--- a/quire-server/src/quire/web/handlers/repo.rs
+++ b/quire-server/src/quire/web/handlers/repo.rs
@@ -1,14 +1,14 @@
//! Handler for the repository home page.
use axum::extract::{Path as AxumPath, State};
-use axum::response::Response;
use axum::http::StatusCode;
use axum::response::IntoResponse;
+use axum::response::Response;
-use super::git::{read_bookmarks, read_git_data, read_tags};
-use super::render;
use super::super::db;
use super::super::templates::{RepoHomeTemplate, RunListRow};
+use super::git::{read_bookmarks, read_git_data, read_tags};
+use super::render;
use crate::Quire;
pub async fn repo_home(State(quire): State<Quire>, AxumPath(repo): AxumPath<String>) -> Response {
diff --git a/quire-server/src/quire/web/handlers/tree.rs b/quire-server/src/quire/web/handlers/tree.rs
index ccb94a1..3353f75 100644
--- a/quire-server/src/quire/web/handlers/tree.rs
+++ b/quire-server/src/quire/web/handlers/tree.rs
@@ -4,10 +4,10 @@ use axum::extract::{Path as AxumPath, State};
use axum::http::StatusCode;
use axum::response::{IntoResponse, Response};
-use super::git::{read_bookmarks, read_tags, run_git};
-use super::render;
use super::super::db;
use super::super::templates::{Crumb, PathCommit, TreeEntry, TreeEntryKind, TreeTemplate};
+use super::git::{read_bookmarks, read_tags, run_git};
+use super::render;
use crate::Quire;
use crate::quire::Repo;
@@ -82,8 +82,8 @@ struct TreeData {
}
fn read_tree_data(repo: &Repo, path: &str) -> Option<TreeData> {
- let bookmark = run_git(repo, &["symbolic-ref", "--short", "HEAD"])
- .unwrap_or_else(|| "main".to_string());
+ let bookmark =
+ run_git(repo, &["symbolic-ref", "--short", "HEAD"]).unwrap_or_else(|| "main".to_string());
let sha_short =
run_git(repo, &["rev-parse", "--short", "HEAD"]).unwrap_or_else(|| "unknown".to_string());
@@ -141,15 +141,22 @@ fn read_tree_data(repo: &Repo, path: &str) -> Option<TreeData> {
} else {
format!("{}/{}", path, name)
};
- let commit_info =
- run_git(repo, &["log", "-1", "--format=%s|%ar", "HEAD", "--", &entry_path]);
+ let commit_info = run_git(
+ repo,
+ &["log", "-1", "--format=%s|%ar", "HEAD", "--", &entry_path],
+ );
let (last_msg, age) = commit_info
.and_then(|s| {
let mut it = s.splitn(2, '|');
Some((it.next()?.to_string(), it.next()?.to_string()))
})
.unwrap_or_default();
- entries.push(TreeEntry { kind, name, last_msg, age });
+ entries.push(TreeEntry {
+ kind,
+ name,
+ last_msg,
+ age,
+ });
}
let head_commit = {
@@ -186,5 +193,12 @@ fn read_tree_data(repo: &Repo, path: &str) -> Option<TreeData> {
})
};
- Some(TreeData { bookmark, sha_short, entries, total_entries, head_commit, readme_preview })
+ Some(TreeData {
+ bookmark,
+ sha_short,
+ entries,
+ total_entries,
+ head_commit,
+ readme_preview,
+ })
}
diff --git a/quire-server/src/quire/web/mod.rs b/quire-server/src/quire/web/mod.rs
index 13b1fb5..b9f6c08 100644
--- a/quire-server/src/quire/web/mod.rs
+++ b/quire-server/src/quire/web/mod.rs
@@ -29,7 +29,10 @@ pub fn router(quire: Quire) -> axum::Router {
axum::routing::get(handlers::run_detail),
)
.route("/{repo}/tree", axum::routing::get(handlers::tree_view))
- .route("/{repo}/tree/{*path}", axum::routing::get(handlers::tree_view_path))
+ .route(
+ "/{repo}/tree/{*path}",
+ axum::routing::get(handlers::tree_view_path),
+ )
.route("/config", axum::routing::get(handlers::config))
.with_state(quire)
}
diff --git a/quire-server/src/quire/web/templates.rs b/quire-server/src/quire/web/templates.rs
index 6b0a68d..426aef2 100644
--- a/quire-server/src/quire/web/templates.rs
+++ b/quire-server/src/quire/web/templates.rs
@@ -431,24 +431,15 @@ impl TreeTemplate {
}
pub fn dir_count(&self) -> usize {
- self.entries
- .iter()
- .filter(|e| e.is_dir())
- .count()
+ self.entries.iter().filter(|e| e.is_dir()).count()
}
pub fn submodule_count(&self) -> usize {
- self.entries
- .iter()
- .filter(|e| e.is_submodule())
- .count()
+ self.entries.iter().filter(|e| e.is_submodule()).count()
}
pub fn file_count(&self) -> usize {
- self.entries
- .iter()
- .filter(|e| e.is_file())
- .count()
+ self.entries.iter().filter(|e| e.is_file()).count()
}
pub fn sha_head(&self) -> &str {