cargo fmt
https://claude.ai/code/session_01Ngf4zbFf87zJFUR5ee2Y8b
diff --git a/quire-ci/src/main.rs b/quire-ci/src/main.rs
index 88c19be..da23f1b 100644
--- a/quire-ci/src/main.rs
+++ b/quire-ci/src/main.rs
@@ -12,9 +12,9 @@ use quire_core::api::SecretResponse;
use quire_core::ci::bootstrap::Bootstrap;
use quire_core::ci::event::{Event, EventKind, JobOutcome, RunOutcome};
use quire_core::ci::pipeline::{self, Pipeline, RunFn};
+use quire_core::ci::run::ApiSession;
use quire_core::ci::run::RunMeta;
use quire_core::ci::runtime::{Runtime, RuntimeError, RuntimeEvent, RuntimeHandle};
-use quire_core::ci::run::ApiSession;
use quire_core::fennel::FennelError;
use quire_core::secret::{Error as SecretError, Result as SecretResult, SecretRegistry};
use quire_core::telemetry::{self, FmtMode, MietteLayer};
@@ -411,7 +411,10 @@ fn git_rev_parse(git_dir: &std::path::Path, rev: &str) -> Result<String> {
let stderr = String::from_utf8_lossy(&out.stderr);
bail!("git rev-parse {rev} failed: {stderr}");
}
- Ok(String::from_utf8(out.stdout).into_diagnostic()?.trim().to_string())
+ Ok(String::from_utf8(out.stdout)
+ .into_diagnostic()?
+ .trim()
+ .to_string())
}
fn git_symbolic_ref(git_dir: &std::path::Path) -> Result<String> {
@@ -425,7 +428,10 @@ fn git_symbolic_ref(git_dir: &std::path::Path) -> Result<String> {
if !out.status.success() {
bail!("HEAD is detached");
}
- Ok(String::from_utf8(out.stdout).into_diagnostic()?.trim().to_string())
+ Ok(String::from_utf8(out.stdout)
+ .into_diagnostic()?
+ .trim()
+ .to_string())
}
fn validate(workspace: PathBuf) -> Result<()> {
diff --git a/quire-core/src/ci/run.rs b/quire-core/src/ci/run.rs
index 8b2e181..9c26214 100644
--- a/quire-core/src/ci/run.rs
+++ b/quire-core/src/ci/run.rs
@@ -5,8 +5,8 @@
//! metadata and session credentials the runtime needs at execute time.
use jiff::Timestamp;
-use rand::distr::Alphanumeric;
use rand::Rng as _;
+use rand::distr::Alphanumeric;
/// Immutable metadata for a CI run. Passed to `Runs::create` at
/// enqueue time; the fields are written to the `runs` row once.
diff --git a/quire-server/src/ci/mod.rs b/quire-server/src/ci/mod.rs
index 0062c60..2c0bcba 100644
--- a/quire-server/src/ci/mod.rs
+++ b/quire-server/src/ci/mod.rs
@@ -8,8 +8,8 @@ pub use error::{Error, Result};
pub use quire_core::ci::pipeline::{
DefinitionError, Diagnostic, Job, Pipeline, PipelineError, StructureError,
};
-pub use quire_core::ci::run::RunMeta;
pub use quire_core::ci::run::ApiSession;
+pub use quire_core::ci::run::RunMeta;
pub use quire_core::ci::{pipeline, registration, runtime};
pub use run::{Executor, Run, RunState, Runs, materialize_workspace, reconcile_orphans};
@@ -500,7 +500,14 @@ exit 0
let db_path = quire.db_path();
let ctx = run_ctx(&repo, &db_path);
let trigger_result = with_path(&fake_path, || {
- run_ref_inner(&ctx, pushed_at, &push_ref, &ApiSession::new(3000), None, None)
+ run_ref_inner(
+ &ctx,
+ pushed_at,
+ &push_ref,
+ &ApiSession::new(3000),
+ None,
+ None,
+ )
});
trigger_result.expect("trigger_ref should succeed with fake quire-ci");
@@ -548,7 +555,14 @@ exit 0
let db_path = quire.db_path();
let ctx = run_ctx(&repo, &db_path);
let trigger_result = with_path(&fake_path, || {
- run_ref_inner(&ctx, pushed_at, &push_ref, &ApiSession::new(3000), None, None)
+ run_ref_inner(
+ &ctx,
+ pushed_at,
+ &push_ref,
+ &ApiSession::new(3000),
+ None,
+ None,
+ )
});
let err = trigger_result.expect_err("should fail when quire-ci exits nonzero");
@@ -585,8 +599,15 @@ exit 0
let db_path = quire.db_path();
let ctx = run_ctx(&repo, &db_path);
- run_ref_inner(&ctx, pushed_at, &push_ref, &ApiSession::new(3000), None, None)
- .expect("should succeed without ci.fnl");
+ run_ref_inner(
+ &ctx,
+ pushed_at,
+ &push_ref,
+ &ApiSession::new(3000),
+ None,
+ None,
+ )
+ .expect("should succeed without ci.fnl");
}
fn push_event(repo: &str, sha: &str) -> PushEvent {
diff --git a/quire-server/src/ci/run.rs b/quire-server/src/ci/run.rs
index ace2225..5adf3c8 100644
--- a/quire-server/src/ci/run.rs
+++ b/quire-server/src/ci/run.rs
@@ -8,9 +8,9 @@
use std::collections::HashMap;
use std::path::{Path, PathBuf};
+use super::error::{Error, Result};
use jiff::Timestamp;
use quire_core::ci::run::ApiSession;
-use super::error::{Error, Result};
pub use quire_core::ci::run::RunMeta;
@@ -826,10 +826,7 @@ mod tests {
|row| row.get(0),
)
.expect("row");
- assert_eq!(
- stored.as_deref(),
- Some(session.run_token.as_str())
- );
+ assert_eq!(stored.as_deref(), Some(session.run_token.as_str()));
}
#[test]
@@ -838,7 +835,10 @@ mod tests {
assert_eq!(session.server_url, "http://127.0.0.1:3000");
assert_eq!(session.run_token.len(), 32);
assert!(
- session.run_token.chars().all(|c: char| c.is_ascii_alphanumeric()),
+ session
+ .run_token
+ .chars()
+ .all(|c: char| c.is_ascii_alphanumeric()),
"token should be alphanumeric, got {:?}",
session.run_token
);
diff --git a/quire-server/src/quire/web/api.rs b/quire-server/src/quire/web/api.rs
index baaf468..b1af911 100644
--- a/quire-server/src/quire/web/api.rs
+++ b/quire-server/src/quire/web/api.rs
@@ -322,12 +322,7 @@ mod tests {
let session = ApiSession::new(3000);
create_run_with_bootstrap(&env, &session, "/repos/test.git", None).await;
- let resp = get(
- env.app(),
- "/run/bootstrap",
- Some(&session.run_token),
- )
- .await;
+ let resp = get(env.app(), "/run/bootstrap", Some(&session.run_token)).await;
assert_eq!(resp.status(), StatusCode::OK);
use http_body_util::BodyExt;
@@ -375,12 +370,7 @@ mod tests {
.create(&TestEnv::meta(), Some(&session))
.expect("create");
- let resp = get(
- env.app(),
- "/run/secrets/my_token",
- Some(&session.run_token),
- )
- .await;
+ let resp = get(env.app(), "/run/secrets/my_token", Some(&session.run_token)).await;
assert_eq!(resp.status(), StatusCode::OK);
use http_body_util::BodyExt;