fix: commit minor fmt residue blocking mergemaster cherry-picks
Master had 8 uncommitted single-line whitespace changes (blank-line trimming
in test mod headers, etc.) left over from a previous mergemaster cargo-fmt
run that didn't get committed. Each subsequent merge attempt hit:
cherry-pick failed: 'Your local changes to the following files would be
overwritten by merge. Please commit your changes or stash them.'
So merges had been silently un-mergeable for the last several rounds —
mergemaster correctly reported the issue but had no way to fix master's
own state from inside the merge_workspace.
Files affected (all whitespace-only):
- chat/transport/matrix/bot/messages/{handle_message,on_room_message}.rs
- chat/transport/slack/commands/{llm,mod}.rs
- http/mcp/agent_tools/worktree.rs
- http/workflow/story_ops/{create,criterion,update}.rs
cargo clippy --all-targets -- -D warnings: clean
cargo fmt --all --check: clean
2636 tests pass.
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
//! create_story_file: write new story to CRDT/content store.
|
||||
|
||||
|
||||
#[allow(unused_imports)]
|
||||
use super::super::{create_section_content, next_item_number, read_story_content, replace_section_content, slugify_name, story_stage, write_story_content};
|
||||
use super::super::{
|
||||
create_section_content, next_item_number, read_story_content, replace_section_content,
|
||||
slugify_name, story_stage, write_story_content,
|
||||
};
|
||||
|
||||
pub fn create_story_file(
|
||||
root: &std::path::Path,
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
use std::path::Path;
|
||||
|
||||
#[allow(unused_imports)]
|
||||
use super::super::{create_section_content, next_item_number, read_story_content, replace_section_content, slugify_name, story_stage, write_story_content};
|
||||
|
||||
use super::super::{
|
||||
create_section_content, next_item_number, read_story_content, replace_section_content,
|
||||
slugify_name, story_stage, write_story_content,
|
||||
};
|
||||
|
||||
pub fn check_criterion_in_file(
|
||||
project_root: &Path,
|
||||
@@ -229,10 +231,10 @@ pub fn add_criterion_to_file(
|
||||
/// - String → quoted unless it looks like a bool, integer, or inline sequence
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::update_story_in_file;
|
||||
use super::*;
|
||||
use serde_json::Value;
|
||||
use std::collections::HashMap;
|
||||
use super::super::update_story_in_file;
|
||||
use std::fs;
|
||||
|
||||
#[allow(dead_code)]
|
||||
|
||||
@@ -5,11 +5,13 @@ use std::collections::HashMap;
|
||||
use std::path::Path;
|
||||
|
||||
#[allow(unused_imports)]
|
||||
use super::super::{create_section_content, next_item_number, read_story_content, replace_section_content, slugify_name, story_stage, write_story_content};
|
||||
use super::super::{
|
||||
create_section_content, next_item_number, read_story_content, replace_section_content,
|
||||
slugify_name, story_stage, write_story_content,
|
||||
};
|
||||
|
||||
use crate::io::story_metadata::set_front_matter_field;
|
||||
|
||||
|
||||
fn json_value_to_yaml_scalar(value: &Value) -> String {
|
||||
match value {
|
||||
Value::Bool(b) => b.to_string(),
|
||||
|
||||
Reference in New Issue
Block a user