diff options
Diffstat (limited to 'src/launcher/download.rs')
| -rw-r--r-- | src/launcher/download.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/launcher/download.rs b/src/launcher/download.rs index 3a89d79..132cd7f 100644 --- a/src/launcher/download.rs +++ b/src/launcher/download.rs @@ -55,7 +55,7 @@ pub struct PhaseDownloadError<'j, T: Download> { job: &'j T } -impl<'j, T: Download> Debug for PhaseDownloadError<'j, T> { +impl<T: Download> Debug for PhaseDownloadError<'_, T> { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.debug_struct("PhaseDownloadError") .field("phase", &self.phase) @@ -65,13 +65,13 @@ impl<'j, T: Download> Debug for PhaseDownloadError<'j, T> { } } -impl<'j, T: Download> Display for PhaseDownloadError<'j, T> { +impl<T: Download> Display for PhaseDownloadError<'_, T> { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "error while {} ({}): {}", self.phase, self.job, self.inner) } } -impl<'j, T: Download> Error for PhaseDownloadError<'j, T> { +impl<T: Download> Error for PhaseDownloadError<'_, T> { fn source(&self) -> Option<&(dyn Error + 'static)> { Some(&*self.inner) } @@ -100,7 +100,7 @@ impl<'j, T: Download + 'j, I: Iterator<Item = &'j mut T>> MultiDownloader<'j, T, } pub async fn perform(self, client: &'j Client) -> impl TryStream<Ok = (), Error = PhaseDownloadError<'j, T>> { - stream::iter(self.jobs.into_iter()).map(move |job| Ok(async move { + stream::iter(self.jobs).map(move |job| Ok(async move { macro_rules! map_err { ($result:expr, $phase:expr, $job:expr) => { match $result { @@ -124,7 +124,7 @@ impl<'j, T: Download + 'j, I: Iterator<Item = &'j mut T>> MultiDownloader<'j, T, map_err!(job.handle_chunk(bytes.as_ref()).await, Phase::HandleChunk, job); } - job.finish().await.map_err(|e| PhaseDownloadError::new(Phase::Finish, e.into(), job))?; + job.finish().await.map_err(|e| PhaseDownloadError::new(Phase::Finish, e, job))?; Ok(()) })).try_buffer_unordered(self.nconcurrent) |