Skip to content

Commit b942fe6

Browse files
authored
Implement suggestions from cargo clippy (#100)
1 parent 8b2d78e commit b942fe6

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

ark-cli/src/models/storage.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,7 @@ impl Storage {
376376
false
377377
}
378378
})
379-
.filter_map(|e| match AtomicFile::new(e.path()) {
380-
Ok(file) => Some(file),
381-
Err(_) => None,
382-
});
379+
.filter_map(|e| AtomicFile::new(e.path()).ok());
383380

384381
writeln!(
385382
output,

drop-core/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,6 @@ mod test {
386386
sync::{mpsc::channel, Arc},
387387
};
388388

389-
use tokio;
390-
391389
use crate::{FileTransfer, IrohInstance};
392390

393391
#[tokio::test]
@@ -430,7 +428,7 @@ mod test {
430428
let ticket = send_instance.send_files(files).await.unwrap();
431429
let ticket_str = ticket.to_string();
432430

433-
let (tx, mut rx) = channel::<Vec<FileTransfer>>();
431+
let (tx, _rx) = channel::<Vec<FileTransfer>>();
434432
let handle = Arc::new(crate::FileTransferHandle(tx)); // Assuming FileTransferHandle wraps the sender
435433

436434
let collection = receive_instance

fs-index/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ fn test_track_modification_with_collision() {
923923
/// - Move the file to a subdirectory.
924924
/// - Call `update_one()` 2 times with the relative path of the moved file.
925925
/// - Assert that the index contains the expected number of entries with the
926-
/// correct IDs and paths after the move.
926+
/// - correct IDs and paths after the move.
927927
#[test]
928928
fn test_track_move_to_subdirectory() {
929929
for_each_type!(Crc32, Blake3 => {

fs-storage/src/folder_storage.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ mod tests {
497497
storage.set("key1".to_string(), "value1".to_string());
498498
storage.set("key1".to_string(), "value2".to_string());
499499
assert!(storage.write_fs().is_ok());
500-
assert_eq!(temp_dir.path().exists(), true);
500+
assert!(temp_dir.path().exists());
501501

502502
if let Err(err) = storage.erase() {
503503
panic!("Failed to delete folder: {:?}", err);
@@ -514,13 +514,13 @@ mod tests {
514514
storage.write_fs().unwrap();
515515

516516
storage.set("key1".to_string(), "value1".to_string());
517-
let before_write = fs::metadata(&temp_dir.path())
517+
let before_write = fs::metadata(temp_dir.path())
518518
.unwrap()
519519
.modified()
520520
.unwrap();
521521
thread::sleep(Duration::from_millis(10));
522522
storage.write_fs().unwrap();
523-
let after_write = fs::metadata(&temp_dir.path())
523+
let after_write = fs::metadata(temp_dir.path())
524524
.unwrap()
525525
.modified()
526526
.unwrap();
@@ -616,7 +616,7 @@ mod tests {
616616

617617
for _ in 0..size {
618618
let op = match u8::arbitrary(g) % 9 {
619-
0 | 1 | 2 | 3 | 4 => {
619+
0..=4 => {
620620
let key = u8::arbitrary(g).to_string();
621621
existing_keys.insert(key.clone());
622622
StorageOperation::Set(key)
@@ -682,7 +682,7 @@ mod tests {
682682
let path = temp_dir.path();
683683

684684
let mut storage =
685-
FolderStorage::<String, Dummy>::new("test".to_string(), &path)
685+
FolderStorage::<String, Dummy>::new("test".to_string(), path)
686686
.unwrap();
687687
let mut expected_data: BTreeMap<String, Dummy> = BTreeMap::new();
688688
let mut pending_deletes = BTreeSet::new();
@@ -797,11 +797,11 @@ mod tests {
797797
let ram_newer = ram_newer
798798
|| pending_sets
799799
.iter()
800-
.any(|(k, v)| pending_external.get(k).map_or(true, |e| v > e));
800+
.any(|(k, v)| pending_external.get(k).is_none_or(|e| v > e));
801801
let disk_newer = pending_external
802802
.iter()
803803
.filter(|(k, _)| !pending_deletes.contains(*k))
804-
.any(|(k, v)| pending_sets.get(k).map_or(true, |s| v > s));
804+
.any(|(k, v)| pending_sets.get(k).is_none_or(|s| v > s));
805805

806806
match (ram_newer, disk_newer) {
807807
(false, false) => SyncStatus::InSync,

0 commit comments

Comments
 (0)