From 762064efd6d06e6a4fd83f2550c8e5b0fca1cf34 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Tue, 29 Dec 2020 21:31:33 +0100 Subject: [PATCH] clean up --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index d7d390b..250252f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ mod ui; use crate::config::Config; use anyhow::{Context, Error, Result}; -use futures::{future, pin_mut, prelude::*}; +use futures::{pin_mut, prelude::*}; use glib::{subclass::prelude::*, GBoxed, GString}; use gstreamer::{gst_element_error, prelude::*, Element}; use gstreamer_base::prelude::*; @@ -540,13 +540,13 @@ async fn transcode( .await } -async fn rm_file_on_err(path: &Path, f: F) -> F::Output +async fn rm_file_on_err(path: &Path, f: F) -> Result where F: Future>, { match f.await { Err(err) => match fs::remove_file(path).await { - Ok(..) => Err(err), + Ok(()) => Err(err), Err(fs_err) if fs_err.kind() == std::io::ErrorKind::NotFound => Err(err), Err(fs_err) => { let err = err