style: cargo fmt on today's new code (883/884/886/opus-pin)
The mergemaster gates run rustfmt and rejected 864's merge because several files I added/touched in master today had not been fmt'd. Six files affected, mostly trivial line-wrapping nits. Fixes the formatting gate for the next 864 merge attempt.
This commit is contained in:
@@ -36,9 +36,7 @@ pub fn spawn_permission_listener(
|
||||
tokio::spawn(async move {
|
||||
let mut perm_rx = services.perm_rx.lock().await;
|
||||
let target_room_str = target_room.as_str().to_string();
|
||||
slog!(
|
||||
"[matrix-bot] permission listener started; forwarding requests to {target_room_str}"
|
||||
);
|
||||
slog!("[matrix-bot] permission listener started; forwarding requests to {target_room_str}");
|
||||
|
||||
while let Some(perm_fwd) = perm_rx.recv().await {
|
||||
let prompt_msg = format!(
|
||||
@@ -131,13 +129,7 @@ mod tests {
|
||||
Ok("$test_event_id:example.com".to_string())
|
||||
}
|
||||
|
||||
async fn edit_message(
|
||||
&self,
|
||||
_: &str,
|
||||
_: &str,
|
||||
_: &str,
|
||||
_: &str,
|
||||
) -> Result<(), String> {
|
||||
async fn edit_message(&self, _: &str, _: &str, _: &str, _: &str) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -146,19 +138,14 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
fn test_services_with_tx() -> (
|
||||
Arc<Services>,
|
||||
mpsc::UnboundedSender<PermissionForward>,
|
||||
) {
|
||||
fn test_services_with_tx() -> (Arc<Services>, mpsc::UnboundedSender<PermissionForward>) {
|
||||
let (perm_tx, perm_rx) = mpsc::unbounded_channel();
|
||||
let services = Arc::new(Services {
|
||||
project_root: std::path::PathBuf::from("/tmp/test"),
|
||||
agents: Arc::new(crate::agents::AgentPool::new_test(3000)),
|
||||
bot_name: "Assistant".to_string(),
|
||||
bot_user_id: "@bot:example.com".to_string(),
|
||||
ambient_rooms: Arc::new(std::sync::Mutex::new(
|
||||
std::collections::HashSet::new(),
|
||||
)),
|
||||
ambient_rooms: Arc::new(std::sync::Mutex::new(std::collections::HashSet::new())),
|
||||
perm_rx: Arc::new(TokioMutex::new(perm_rx)),
|
||||
pending_perm_replies: Arc::new(TokioMutex::new(HashMap::new())),
|
||||
permission_timeout_secs: 120,
|
||||
|
||||
Reference in New Issue
Block a user