From c9d6660ba6cfc943d08da1235631d0d6dc04829d Mon Sep 17 00:00:00 2001 From: "claude@clouddev1" Date: Mon, 22 Jun 2026 21:43:51 +0000 Subject: [PATCH] style: rustfmt the blob-removal code (fix the CI fmt gate) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The blob-removal commit (6b4c4dc) failed CI's fmt gate — long assert! lines and a doc comment that stock rustfmt wraps. No behaviour change; just `cargo fmt`. Verified via `nix develop -c cargo fmt --check`. --- src/persistence/migrations.rs | 3 +-- src/runtime.rs | 7 ++++--- tests/e2e_pty.rs | 6 +++++- tests/it/blob_removal_migration.rs | 15 ++++++++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/persistence/migrations.rs b/src/persistence/migrations.rs index fd1a162..9aaade9 100644 --- a/src/persistence/migrations.rs +++ b/src/persistence/migrations.rs @@ -394,8 +394,7 @@ mod tests { " - \"note <> 'type: blob'\"\n", "relationships: []\n", ); - let outcome = - migrate_to_latest(body, &MigratorRegistry::production(), tmp.path()).unwrap(); + let outcome = migrate_to_latest(body, &MigratorRegistry::production(), tmp.path()).unwrap(); assert_eq!(outcome.migrated_from, Some(1)); assert!(outcome.body.contains("version: 2")); // The blob column became text. diff --git a/src/runtime.rs b/src/runtime.rs index 4d8c0a8..f2c1d89 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -180,9 +180,10 @@ pub async fn run(args: Args) -> Result<()> { // force a `.db` rebuild after the v1→v2 migration converts it to text // (the stale `.db` keeps a `STRICT … BLOB` engine column + `"blob"` // metadata that load otherwise uses as-is). - let had_blob_column = std::fs::read_to_string(project.path().join(crate::project::PROJECT_YAML)) - .map(|b| crate::persistence::migrations::body_declares_blob_column(&b)) - .unwrap_or(false); + let had_blob_column = + std::fs::read_to_string(project.path().join(crate::project::PROJECT_YAML)) + .map(|b| crate::persistence::migrations::body_declares_blob_column(&b)) + .unwrap_or(false); let migrate_registry = crate::persistence::migrations::MigratorRegistry::production(); let migration_outcome = crate::persistence::migrations::ensure_project_yaml_migrated( project.path(), diff --git a/tests/e2e_pty.rs b/tests/e2e_pty.rs index 8bfaaae..6ca5488 100644 --- a/tests/e2e_pty.rs +++ b/tests/e2e_pty.rs @@ -437,7 +437,11 @@ fn opens_a_legacy_v1_blob_project_by_migrating_to_text() { ), ) .expect("write project.yaml"); - fs::write(proj.join("data").join("Files.csv"), "id,payload\n1,aGVsbG8=\n").expect("write csv"); + fs::write( + proj.join("data").join("Files.csv"), + "id,payload\n1,aGVsbG8=\n", + ) + .expect("write csv"); fs::write(root.join("last_project"), format!("{}\n", proj.display())).expect("write resume"); // Open via --resume: the runtime migrates blob→text and rebuilds, so diff --git a/tests/it/blob_removal_migration.rs b/tests/it/blob_removal_migration.rs index 344767b..76391ae 100644 --- a/tests/it/blob_removal_migration.rs +++ b/tests/it/blob_removal_migration.rs @@ -55,15 +55,24 @@ fn v1_blob_project_migrates_to_text_and_rebuilds() { assert_eq!(outcome.migrated_from, Some(1), "v1 project was migrated"); let migrated = fs::read_to_string(root.join("project.yaml")).expect("read migrated"); - assert!(migrated.contains("version: 2"), "version bumped: {migrated}"); + assert!( + migrated.contains("version: 2"), + "version bumped: {migrated}" + ); assert!( migrated.contains("{ name: data, type: text }"), "blob column rewritten to text: {migrated}" ); - assert!(!migrated.contains("type: blob"), "no blob type remains: {migrated}"); + assert!( + !migrated.contains("type: blob"), + "no blob type remains: {migrated}" + ); // The pre-migration original is preserved as a .bak. let bak = fs::read_to_string(root.join("project.yaml.v1.bak")).expect("read bak"); - assert!(bak.contains("type: blob"), "bak keeps the original blob column"); + assert!( + bak.contains("type: blob"), + "bak keeps the original blob column" + ); // 2. Rebuild from the migrated text (as the runtime forces when a blob // column was converted): the column is now `text` and the row data