mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-18 09:23:13 +00:00
style: collapse nested if block
lint message: this `if` statement can be collapsed help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#collapsible_if
This commit is contained in:
@@ -163,7 +163,8 @@ impl LayoutManager {
|
||||
let prev_layout_check = layout.is_check_ok();
|
||||
|
||||
if !prev_layout_check || adv.check().is_ok() {
|
||||
if layout.update(|l| l.merge(adv)) {
|
||||
let changed = layout.update(|l| l.merge(adv));
|
||||
if changed {
|
||||
layout.update_update_trackers(self.node_id);
|
||||
if prev_layout_check && !layout.is_check_ok() {
|
||||
panic!("Merged two correct layouts and got an incorrect layout.");
|
||||
@@ -181,7 +182,8 @@ impl LayoutManager {
|
||||
let prev_digest = layout.digest();
|
||||
|
||||
if layout.inner().update_trackers != *adv {
|
||||
if layout.update(|l| l.update_trackers.merge(adv)) {
|
||||
let changed = layout.update(|l| l.update_trackers.merge(adv));
|
||||
if changed {
|
||||
layout.update_update_trackers(self.node_id);
|
||||
assert!(layout.digest() != prev_digest);
|
||||
return Some(layout.inner().update_trackers.clone());
|
||||
|
||||
Reference in New Issue
Block a user