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/library/cells.rs

@@ -661,18 +661,33 @@ mod tests {
             .unwrap();
 
         let filter = RatingFilter::default();
-        let cells = read_cells_scoped(&catalog, Some(Scope::Collection(coll)), &filter, 0, 100).unwrap();
+        let cells =
+            read_cells_scoped(&catalog, Some(Scope::Collection(coll)), &filter, 0, 100).unwrap();
         assert_eq!(cells.len(), 2);
         for (i, cell) in cells.iter().enumerate() {
             assert_eq!(
-                ordinal_of_path(&catalog, Some(Scope::Collection(coll)), &filter, false, &cell.remote_path).unwrap(),
+                ordinal_of_path(
+                    &catalog,
+                    Some(Scope::Collection(coll)),
+                    &filter,
+                    false,
+                    &cell.remote_path
+                )
+                .unwrap(),
                 Some(i),
                 "{} is drawn at row {i} of the collection",
                 cell.remote_path
             );
         }
         assert_eq!(
-            ordinal_of_path(&catalog, Some(Scope::Collection(coll)), &filter, false, "2019/a.CR2").unwrap(),
+            ordinal_of_path(
+                &catalog,
+                Some(Scope::Collection(coll)),
+                &filter,
+                false,
+                "2019/a.CR2"
+            )
+            .unwrap(),
             None,
             "not a member"
         );