diff --git a/crates/workdir/src/external_local_tests.rs b/crates/workdir/src/external_local_tests.rs index 1ee8d8eac..f0cf5c9a2 100644 --- a/crates/workdir/src/external_local_tests.rs +++ b/crates/workdir/src/external_local_tests.rs @@ -90,8 +90,15 @@ async fn external_local_provider_read_write_is_filesystem_only() { ) .unwrap(); - assert_eq!(session.capabilities(), WorkdirSessionCapabilities::READ_WRITE); - assert!(!session.capabilities().supports(WorkdirSessionCapability::Command)); + assert_eq!( + session.capabilities(), + WorkdirSessionCapabilities::READ_WRITE + ); + assert!( + !session + .capabilities() + .supports(WorkdirSessionCapability::Command) + ); let observed = WorkdirSession::read( &session, diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index 50f2745f9..69cfef1d0 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -26279,8 +26279,7 @@ mod tests { created_by: test_browser_request_actor().account_id, created_at: created_at.clone(), expires_at: Some( - (now + Duration::milliseconds(50)) - .to_rfc3339_opts(SecondsFormat::Nanos, true), + (now + Duration::milliseconds(50)).to_rfc3339_opts(SecondsFormat::Nanos, true), ), generation: 1, status: "offline".to_string(), @@ -26966,7 +26965,10 @@ mod tests { break (operation_id, operation); } }; - assert!(matches!(operation.as_inner(), WorkdirSessionOperation::Edit(_))); + assert!(matches!( + operation.as_inner(), + WorkdirSessionOperation::Edit(_) + )); let result = workdir::http::dispatch_workdir_session_operation( &local_session, operation.into_inner(), @@ -27015,7 +27017,10 @@ mod tests { break (operation_id, operation); } }; - assert!(matches!(operation.as_inner(), WorkdirSessionOperation::Write(_))); + assert!(matches!( + operation.as_inner(), + WorkdirSessionOperation::Write(_) + )); let result = workdir::http::dispatch_workdir_session_operation( &local_session, operation.into_inner(), diff --git a/crates/workspace-server/src/store.rs b/crates/workspace-server/src/store.rs index 9b09ec95c..da4eaaa37 100644 --- a/crates/workspace-server/src/store.rs +++ b/crates/workspace-server/src/store.rs @@ -11969,9 +11969,7 @@ fn apply_ticket_targets_and_workdir_capabilities_schema(conn: &Connection) -> Re } } -fn migrate_external_workdir_access_and_optional_expiry_v66_to_v67( - conn: &Connection, -) -> Result<()> { +fn migrate_external_workdir_access_and_optional_expiry_v66_to_v67(conn: &Connection) -> Result<()> { let current = current_schema_version(conn)?; if current != 66 { return Err(Error::Store(format!( @@ -12068,11 +12066,10 @@ fn migrate_external_workdir_access_and_optional_expiry_v66_to_v67( BEGIN SELECT RAISE(ABORT, 'runtime_removal_in_progress'); END; "#, )?; - let violations = tx.query_row( - "SELECT COUNT(*) FROM pragma_foreign_key_check", - [], - |row| row.get::<_, i64>(0), - )?; + let violations = + tx.query_row("SELECT COUNT(*) FROM pragma_foreign_key_check", [], |row| { + row.get::<_, i64>(0) + })?; if violations != 0 { return Err(Error::Store(format!( "schema-67 migration left {violations} foreign-key violation(s)" @@ -14368,7 +14365,9 @@ mod tests { .iter() .map(|migration| migration.version) .collect::>(), - vec![52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67] + vec![ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67 + ] ); SqliteWorkspaceStore::migrate_database(&path).unwrap(); let conn = Connection::open(&path).unwrap(); diff --git a/crates/yoi/src/workdir_share.rs b/crates/yoi/src/workdir_share.rs index 885e5525d..44d104abf 100644 --- a/crates/yoi/src/workdir_share.rs +++ b/crates/yoi/src/workdir_share.rs @@ -131,7 +131,9 @@ fn authenticated_server_api_client( fn permission_label(permission: server_api::ExternalWorkdirPermission) -> &'static str { match permission { server_api::ExternalWorkdirPermission::ReadOnly => "read-only", - server_api::ExternalWorkdirPermission::ReadWrite => "read-write (files only; commands disabled)", + server_api::ExternalWorkdirPermission::ReadWrite => { + "read-write (files only; commands disabled)" + } } } @@ -233,7 +235,8 @@ fn configure_interactively( input, output, &format!("Workspace [{}; q to cancel]: ", initial_index + 1), - )? else { + )? + else { return Ok(None); }; if matches!(selection.as_str(), "q" | "quit" | "cancel") { @@ -264,7 +267,8 @@ fn configure_interactively( input, output, &format!("Permission [r/w; current {current_permission}; q to cancel]: "), - )? else { + )? + else { return Ok(None); }; options.permission = match permission.as_str() { @@ -281,7 +285,8 @@ fn configure_interactively( input, output, "TTL [empty keeps current; `none` is unlimited; q to cancel]: ", - )? else { + )? + else { return Ok(None); }; options.ttl = match ttl.as_str() { @@ -418,7 +423,10 @@ pub(crate) async fn run(options: WorkdirShareOptions) -> Result<(), String> { println!("Permission: {}", permission_label(grant.permission)); println!( "Expires at: {}", - grant.expires_at.as_deref().unwrap_or("never (until stopped or revoked)") + grant + .expires_at + .as_deref() + .unwrap_or("never (until stopped or revoked)") ); let expires_at = grant @@ -939,14 +947,10 @@ mod tests { let mut input = std::io::Cursor::new(b"\n\n\nyes\n".to_vec()); let mut output = Vec::new(); - let selected = configure_interactively( - share_options(), - &workspaces, - &mut input, - &mut output, - ) - .unwrap() - .unwrap(); + let selected = + configure_interactively(share_options(), &workspaces, &mut input, &mut output) + .unwrap() + .unwrap(); assert_eq!(selected.workspace_id, "workspace-a"); assert_eq!( @@ -970,14 +974,10 @@ mod tests { let mut input = std::io::Cursor::new(b"2\nw\n15m\ny\n".to_vec()); let mut output = Vec::new(); - let selected = configure_interactively( - share_options(), - &workspaces, - &mut input, - &mut output, - ) - .unwrap() - .unwrap(); + let selected = + configure_interactively(share_options(), &workspaces, &mut input, &mut output) + .unwrap() + .unwrap(); assert_eq!(selected.workspace_id, "workspace-b"); assert_eq!( @@ -993,14 +993,9 @@ mod tests { let mut declined = std::io::Cursor::new(b"\n\n\nno\n".to_vec()); let mut output = Vec::new(); assert!( - configure_interactively( - share_options(), - &workspaces, - &mut declined, - &mut output, - ) - .unwrap() - .is_none() + configure_interactively(share_options(), &workspaces, &mut declined, &mut output,) + .unwrap() + .is_none() ); let mut eof = std::io::Cursor::new(Vec::::new()); @@ -1014,8 +1009,16 @@ mod tests { #[test] fn interactive_share_fails_closed_without_input_and_prompt_ttys() { assert!(ensure_interactive_tty(true, true).is_ok()); - assert!(ensure_interactive_tty(false, true).unwrap_err().contains("--non-interactive")); - assert!(ensure_interactive_tty(true, false).unwrap_err().contains("--non-interactive")); + assert!( + ensure_interactive_tty(false, true) + .unwrap_err() + .contains("--non-interactive") + ); + assert!( + ensure_interactive_tty(true, false) + .unwrap_err() + .contains("--non-interactive") + ); } fn test_server_api_client(base_url: &str) -> ServerApiClient {