diff options
author | Alex Auvolat <alex@adnab.me> | 2023-12-11 15:31:47 +0100 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-12-11 15:31:47 +0100 |
commit | 85b5a6bcd11c0a7651e4c589569e1935a3d18e46 (patch) | |
tree | 5aabcc8e161dfb304514e23e59f9ccf5a52a6d0a /src/table | |
parent | e4f493b48156e6e30f16fba10f300f6cb5fe0b0d (diff) | |
download | garage-85b5a6bcd11c0a7651e4c589569e1935a3d18e46.tar.gz garage-85b5a6bcd11c0a7651e4c589569e1935a3d18e46.zip |
fix some clippy lints
Diffstat (limited to 'src/table')
-rw-r--r-- | src/table/sync.rs | 8 | ||||
-rw-r--r-- | src/table/table.rs | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/table/sync.rs b/src/table/sync.rs index cfcbc4b5..1561a2e5 100644 --- a/src/table/sync.rs +++ b/src/table/sync.rs @@ -123,15 +123,15 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> { let mut sync_futures = result_tracker .nodes - .iter() - .map(|(node, _)| *node) + .keys() + .copied() .map(|node| { let must_exit = must_exit.clone(); async move { if node == my_id { (node, Ok(())) } else { - (node, self.do_sync_with(&partition, node, must_exit).await) + (node, self.do_sync_with(partition, node, must_exit).await) } } }) @@ -145,7 +145,7 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> { } if result_tracker.too_many_failures() { - return Err(result_tracker.quorum_error()); + Err(result_tracker.quorum_error()) } else { Ok(()) } diff --git a/src/table/table.rs b/src/table/table.rs index 05a0dab1..a5be2910 100644 --- a/src/table/table.rs +++ b/src/table/table.rs @@ -209,8 +209,7 @@ impl<F: TableSchema, R: TableReplication> Table<F, R> { // it takes part, to optimize the detection of a quorum. let mut write_sets = entries_vec .iter() - .map(|(wss, _)| wss.as_ref().iter().map(|ws| ws.as_slice())) - .flatten() + .flat_map(|(wss, _)| wss.as_ref().iter().map(|ws| ws.as_slice())) .collect::<Vec<&[Uuid]>>(); write_sets.sort(); write_sets.dedup(); |