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.
This commit is contained in:
@@ -313,8 +313,7 @@ fn stage(encoded: &Encoded, remote_dir: &str, outbox: &Path) -> Result<PathBuf,
|
||||
Some(dir) => format!("{dir}\n{}\naccount\n", encoded.name),
|
||||
None => format!("{remote_dir}\n{}\n", encoded.name),
|
||||
};
|
||||
std::fs::write(&record, text)
|
||||
.map_err(|e| format!("{}: {e}", record.display()))?;
|
||||
std::fs::write(&record, text).map_err(|e| format!("{}: {e}", record.display()))?;
|
||||
|
||||
Ok(candidate)
|
||||
}
|
||||
@@ -1503,7 +1502,13 @@ mod tests {
|
||||
std::thread::current().id()
|
||||
));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
place(&encoded("a.jpg", b"x"), ExportTarget::Remote, "/Shared/Web", &dir).unwrap();
|
||||
place(
|
||||
&encoded("a.jpg", b"x"),
|
||||
ExportTarget::Remote,
|
||||
"/Shared/Web",
|
||||
&dir,
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let entry = pending(&dir).pop().expect("one staged export");
|
||||
assert!(entry.account);
|
||||
|
||||
Reference in New Issue
Block a user