Apply cargo fix

This commit is contained in:
asonix 2023-12-22 20:54:02 -06:00
parent 5624671cbf
commit b938b09901
11 changed files with 7 additions and 22 deletions

View File

@ -1,5 +1,4 @@
use actix_web::web::Bytes; use actix_web::web::Bytes;
use tokio::io::AsyncReadExt;
use crate::{ use crate::{
exiftool::ExifError, exiftool::ExifError,

View File

@ -3,7 +3,6 @@ use crate::{
process::{Process, ProcessError, ProcessRead}, process::{Process, ProcessError, ProcessRead},
}; };
use actix_web::web::Bytes; use actix_web::web::Bytes;
use tokio::io::{AsyncRead, AsyncReadExt};
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub(crate) enum ExifError { pub(crate) enum ExifError {

View File

@ -17,7 +17,7 @@ use std::{
sync::Arc, sync::Arc,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use tokio::io::AsyncReadExt;
use tracing::Instrument; use tracing::Instrument;
struct MetricsGuard { struct MetricsGuard {
@ -253,7 +253,7 @@ where
}; };
let motion_identifier = reader let motion_identifier = reader
.with_stdout(|mut stdout| async { store.save_async_read(stdout, media_type).await }) .with_stdout(|stdout| async { store.save_async_read(stdout, media_type).await })
.await??; .await??;
repo.relate_motion_identifier(hash, &motion_identifier) repo.relate_motion_identifier(hash, &motion_identifier)

View File

@ -6,7 +6,6 @@ use crate::{
ffmpeg::FfMpegError, ffmpeg::FfMpegError,
formats::InternalVideoFormat, formats::InternalVideoFormat,
process::{Process, ProcessRead}, process::{Process, ProcessRead},
read::BoxRead,
store::Store, store::Store,
tmp_file::TmpDir, tmp_file::TmpDir,
}; };

View File

@ -4,7 +4,6 @@ use crate::{
formats::ProcessableFormat, formats::ProcessableFormat,
magick::{MagickError, MAGICK_TEMPORARY_PATH}, magick::{MagickError, MAGICK_TEMPORARY_PATH},
process::{Process, ProcessRead}, process::{Process, ProcessRead},
read::BoxRead,
store::Store, store::Store,
tmp_file::TmpDir, tmp_file::TmpDir,
}; };

View File

@ -4,7 +4,6 @@ use crate::{
error_code::ErrorCode, error_code::ErrorCode,
formats::ProcessableFormat, formats::ProcessableFormat,
process::{Process, ProcessError, ProcessRead}, process::{Process, ProcessError, ProcessRead},
read::BoxRead,
store::Store, store::Store,
tmp_file::TmpDir, tmp_file::TmpDir,
}; };

View File

@ -3,24 +3,18 @@ use std::{
any::Any, any::Any,
ffi::OsStr, ffi::OsStr,
future::Future, future::Future,
pin::Pin,
process::{ExitStatus, Stdio}, process::{ExitStatus, Stdio},
sync::{ sync::Arc,
atomic::{AtomicU8, Ordering},
Arc, Mutex,
},
task::{Context, Poll, Wake, Waker},
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use tokio::{ use tokio::{
io::{AsyncRead, AsyncReadExt, AsyncWriteExt, ReadBuf}, io::{AsyncReadExt, AsyncWriteExt},
process::{Child, ChildStdin, ChildStdout, Command}, process::{Child, ChildStdin, Command},
}; };
use tracing::{Instrument, Span}; use tracing::Instrument;
use uuid::Uuid; use uuid::Uuid;
use crate::{ use crate::{
error::Error,
error_code::ErrorCode, error_code::ErrorCode,
future::{LocalBoxFuture, WithTimeout}, future::{LocalBoxFuture, WithTimeout},
read::BoxRead, read::BoxRead,

View File

@ -11,7 +11,6 @@ use crate::{
InternalFormat, Validations, InternalFormat, Validations,
}, },
process::ProcessRead, process::ProcessRead,
read::BoxRead,
tmp_file::TmpDir, tmp_file::TmpDir,
}; };
use actix_web::web::Bytes; use actix_web::web::Bytes;

View File

@ -3,7 +3,6 @@ use actix_web::web::Bytes;
use crate::{ use crate::{
exiftool::ExifError, exiftool::ExifError,
process::{Process, ProcessRead}, process::{Process, ProcessRead},
read::BoxRead,
}; };
#[tracing::instrument(level = "trace", skip_all)] #[tracing::instrument(level = "trace", skip_all)]

View File

@ -7,7 +7,6 @@ use crate::{
ffmpeg::FfMpegError, ffmpeg::FfMpegError,
formats::{InputVideoFormat, OutputVideo}, formats::{InputVideoFormat, OutputVideo},
process::{Process, ProcessRead}, process::{Process, ProcessRead},
read::BoxRead,
tmp_file::TmpDir, tmp_file::TmpDir,
}; };

View File

@ -6,8 +6,7 @@ use crate::{
formats::{AnimationFormat, ImageFormat}, formats::{AnimationFormat, ImageFormat},
magick::{MagickError, MAGICK_TEMPORARY_PATH}, magick::{MagickError, MAGICK_TEMPORARY_PATH},
process::{Process, ProcessRead}, process::{Process, ProcessRead},
read::BoxRead, tmp_file::TmpDir,
tmp_file::{TmpDir, TmpFile, TmpFolder},
}; };
pub(super) async fn convert_image( pub(super) async fn convert_image(