lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src: Format let-else statements

Browse source
This commit is contained in:
Sophie Herold 2023-07-06 23:48:56 +02:00
parent 6297dcf54b
commit 06d688e79e
6 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/util/mod.rs
View file

@ -125,11 +125,17 @@ pub async fn untrash(path: &Path) -> anyhow::Result<()> {
.next_files_future(1, glib::Priority::default())
.await
{
let Some(file_info) = info.first()
else { break; };
let Some(file_info) = info.first() else {
break;
};
let Some(original_path) = file_info.attribute_byte_string(gio::FILE_ATTRIBUTE_TRASH_ORIG_PATH).as_ref().map(PathBuf::from)
else { break; };
let Some(original_path) = file_info
.attribute_byte_string(gio::FILE_ATTRIBUTE_TRASH_ORIG_PATH)
.as_ref()
.map(PathBuf::from)
else {
break;
};
if original_path == path {
let trash_file = trash.child(file_info.name());
@ -143,7 +149,9 @@ pub async fn untrash(path: &Path) -> anyhow::Result<()> {
}
// Construct new name of the form "<filename> (i).<ext>"
let Some(path) = original_file.path() else { bail!("File without path") };
let Some(path) = original_file.path() else {
bail!("File without path")
};
let mut name = path
.file_stem()
.map(|x| x.to_os_string())