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:
@@ -265,4 +265,3 @@ pub(in crate::chat::transport::matrix::bot) async fn handle_message(
|
||||
// ---------------------------------------------------------------------------
|
||||
// Tests
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -8,15 +8,13 @@ use matrix_sdk::{
|
||||
Client,
|
||||
event_handler::Ctx,
|
||||
room::Room,
|
||||
ruma::{
|
||||
events::room::message::{MessageType, OriginalSyncRoomMessageEvent},
|
||||
},
|
||||
ruma::events::room::message::{MessageType, OriginalSyncRoomMessageEvent},
|
||||
};
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::super::context::BotContext;
|
||||
use super::super::mentions::{is_addressed_to_other, is_reply_to_bot, mentions_bot};
|
||||
use super::super::format::markdown_to_html;
|
||||
use super::super::mentions::{is_addressed_to_other, is_reply_to_bot, mentions_bot};
|
||||
use super::super::verification::check_sender_verified;
|
||||
|
||||
use super::handle_message;
|
||||
@@ -598,4 +596,3 @@ pub(in crate::chat::transport::matrix::bot) async fn on_room_message(
|
||||
handle_message(room_id_str, incoming_room_id, ctx, sender, user_message).await;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user