Unverified Commit 1344b75e authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

chore(turbo-tasks-backend): Use let instead of match for macro bindings (#71756)

A binding is probably needed here to control what scope it's evaluated in and/or avoid potentially evaluating the expression multiple times.

`match` was being used to create the binding, but it's easier to read as a `let`, and the two versions should be equivalent.

Closes PACK-3325
parent 5c43a3a4
...@@ -469,18 +469,17 @@ macro_rules! update { ...@@ -469,18 +469,17 @@ macro_rules! update {
#[allow(unused_imports)] #[allow(unused_imports)]
use $crate::backend::operation::TaskGuard; use $crate::backend::operation::TaskGuard;
#[allow(unused_mut)] #[allow(unused_mut)]
match $update { let mut update = $update;
mut update => $task.update(&$crate::data::CachedDataItemKey::$key $input, |old| { $task.update(&$crate::data::CachedDataItemKey::$key $input, |old| {
update(old.and_then(|old| { update(old.and_then(|old| {
if let $crate::data::CachedDataItemValue::$key { value } = old { if let $crate::data::CachedDataItemValue::$key { value } = old {
Some(value) Some(value)
} else { } else {
None None
} }
})) }))
.map(|new| $crate::data::CachedDataItemValue::$key { value: new }) .map(|new| $crate::data::CachedDataItemValue::$key { value: new })
}) })
}
}}; }};
($task:ident, $key:ident, $update:expr) => { ($task:ident, $key:ident, $update:expr) => {
$crate::backend::storage::update!($task, $key {}, $update) $crate::backend::storage::update!($task, $key {}, $update)
...@@ -488,39 +487,33 @@ macro_rules! update { ...@@ -488,39 +487,33 @@ macro_rules! update {
} }
macro_rules! update_ucount_and_get { macro_rules! update_ucount_and_get {
($task:ident, $key:ident $input:tt, -$update:expr) => { ($task:ident, $key:ident $input:tt, -$update:expr) => {{
match $update { let update = $update;
update => { let mut value = 0;
let mut value = 0; $crate::backend::storage::update!($task, $key $input, |old: Option<_>| {
$crate::backend::storage::update!($task, $key $input, |old: Option<_>| { if let Some(old) = old {
if let Some(old) = old { value = old - update;
value = old - update; (value != 0).then_some(value)
(value != 0).then_some(value) } else {
} else { None
None
}
});
value
} }
} });
}; value
($task:ident, $key:ident $input:tt, $update:expr) => { }};
match $update { ($task:ident, $key:ident $input:tt, $update:expr) => {{
update => { let update = $update;
let mut value = 0; let mut value = 0;
$crate::backend::storage::update!($task, $key $input, |old: Option<_>| { $crate::backend::storage::update!($task, $key $input, |old: Option<_>| {
if let Some(old) = old { if let Some(old) = old {
value = old + update; value = old + update;
(value != 0).then_some(value) (value != 0).then_some(value)
} else { } else {
value = update; value = update;
(update != 0).then_some(update) (update != 0).then_some(update)
}
});
value
} }
} });
}; value
}};
($task:ident, $key:ident, -$update:expr) => { ($task:ident, $key:ident, -$update:expr) => {
$crate::backend::storage::update_ucount_and_get!($task, $key {}, -$update) $crate::backend::storage::update_ucount_and_get!($task, $key {}, -$update)
}; };
...@@ -530,25 +523,22 @@ macro_rules! update_ucount_and_get { ...@@ -530,25 +523,22 @@ macro_rules! update_ucount_and_get {
} }
macro_rules! update_count { macro_rules! update_count {
($task:ident, $key:ident $input:tt, -$update:expr) => { ($task:ident, $key:ident $input:tt, -$update:expr) => {{
match $update { let update = $update;
update => { let mut state_change = false;
let mut state_change = false; $crate::backend::storage::update!($task, $key $input, |old: Option<_>| {
$crate::backend::storage::update!($task, $key $input, |old: Option<_>| { #[allow(unused_comparisons, reason = "type of update might be unsigned, where update < 0 is always false")]
#[allow(unused_comparisons, reason = "type of update might be unsigned, where update < 0 is always false")] if let Some(old) = old {
if let Some(old) = old { let new = old - update;
let new = old - update; state_change = old <= 0 && new > 0 || old > 0 && new <= 0;
state_change = old <= 0 && new > 0 || old > 0 && new <= 0; (new != 0).then_some(new)
(new != 0).then_some(new) } else {
} else { state_change = update < 0;
state_change = update < 0; (update != 0).then_some(-update)
(update != 0).then_some(-update)
}
});
state_change
} }
} });
}; state_change
}};
($task:ident, $key:ident $input:tt, $update:expr) => { ($task:ident, $key:ident $input:tt, $update:expr) => {
match $update { match $update {
update => { update => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment