Satisfy rustfmt and clippy on the album and folder picker changes

rustfmt over the files the albums work touched, and the album merge's
incoming row as a named struct rather than an eight-field tuple, which
clippy's type_complexity refused.

ui/dr-ui/src/lib.rs

@@ -34,8 +34,8 @@ mod display_ui;
 mod duplicates;
 mod duplicates_ui;
 mod export;
-mod folder_dialog;
 pub mod faces;
+mod folder_dialog;
 pub use library::render_native;
 // Generated from the `GESTURE:` comments beside the code that implements each
 // one — see `tools/traceability`. Regenerate with
@@ -68,9 +68,9 @@ mod recovery_ui;
 mod refine;
 mod remote;
 mod remote_folders;
+pub mod repairs;
 #[cfg(target_os = "android")]
 mod saf;
-pub mod repairs;
 mod segmentation;
 mod settings_store;
 mod settings_ui;