leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: migrate to Rust 2024 edition

Browse source
This commit is contained in:
Vukašin Vojinović 2025-09-03 23:24:38 +02:00 • committed by Jeremy Soller
parent 6ed7bdb45f
commit f95869a631
16 changed files with 194 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/operation/mod.rs
View file

@ -5,7 +5,7 @@ use crate::{
spawn_detached::spawn_detached,
tab,
};
use cosmic::iced::futures::{channel::mpsc::Sender, SinkExt};
use cosmic::iced::futures::{SinkExt, channel::mpsc::Sender};
use std::{
borrow::Cow,
fmt::Formatter,
@ -14,7 +14,7 @@ use std::{
path::{Path, PathBuf},
sync::Arc,
};
use tokio::sync::{mpsc, Mutex as TokioMutex};
use tokio::sync::{Mutex as TokioMutex, mpsc};
use walkdir::WalkDir;
use zip::AesMode::Aes256;
@ -140,9 +140,11 @@ async fn copy_or_move(
Ok(()) => {
log::info!("renamed {from:?} to {to:?}");
false
},
}
Err(err) => {
log::info!("failed to rename {from:?} to {to:?}, fallback to recursive move: {err}");
log::info!(
"failed to rename {from:?} to {to:?}, fallback to recursive move: {err}"
);
true
}
}
@ -1155,7 +1157,7 @@ mod tests {
path::PathBuf,
};
use cosmic::iced::futures::{channel::mpsc, StreamExt};
use cosmic::iced::futures::{StreamExt, channel::mpsc};
use log::debug;
use test_log::test;
use tokio::sync;
@ -1163,11 +1165,11 @@ mod tests {
use super::{Controller, Operation, OperationError, OperationSelection, ReplaceResult};
use crate::{
app::{
test_utils::{
empty_fs, filter_dirs, filter_files, simple_fs, NAME_LEN, NUM_DIRS, NUM_FILES,
NUM_HIDDEN, NUM_NESTED,
},
DialogPage, Message,
test_utils::{
NAME_LEN, NUM_DIRS, NUM_FILES, NUM_HIDDEN, NUM_NESTED, empty_fs, filter_dirs,
filter_files, simple_fs,
},
},
fl,
};
@ -1198,10 +1200,13 @@ mod tests {
match msg {
Message::DialogPush(DialogPage::Replace { tx, .. }) => {
debug!("[{id}] Replace request");
tx.send(ReplaceResult::Cancel).await.expect("Sending a response to a replace request should succeed")
tx.send(ReplaceResult::Cancel)
.await
.expect("Sending a response to a replace request should succeed")
}
_ => unreachable!("Only [ `Message::PendingProgress`, `Message::DialogPush(DialogPage::Replace)` ] are sent from operation"),
_ => unreachable!(
"Only [ `Message::PendingProgress`, `Message::DialogPush(DialogPage::Replace)` ] are sent from operation"
),
}
}
};

4
src/operation/recursive.rs
View file

@ -1,6 +1,6 @@
use compio::BufResult;
use compio::buf::{IntoInner, IoBuf};
use compio::io::{AsyncReadAt, AsyncWriteAt};
use compio::BufResult;
use std::future::Future;
use std::pin::Pin;
use std::time::Instant;
@ -9,7 +9,7 @@ use walkdir::WalkDir;
use crate::operation::OperationError;
use super::{copy_unique_path, Controller, OperationSelection, ReplaceResult};
use super::{Controller, OperationSelection, ReplaceResult, copy_unique_path};
pub enum Method {
Copy,