mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up with_task.

Browse Source 
Currently it creates an `Option` and then does `map`/`unwrap_or` and
`map_or_else` on it, which is hard to read.

This commit simplifies things by moving more code into the two arms of
the if/else.
This commit is contained in:
Nicholas Nethercote 2023-04-27 15:04:18 +10:00
parent 458d4dae84
commit 207cec017f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_query_system/src/dep_graph/graph.rs
View File

@ -354,24 +354,20 @@ pub fn with_task<Ctxt: HasDepContext<DepKind = K>, A: Debug, R>(
- dep-node: {key:?}"
);
let task_deps = if cx.dep_context().is_eval_always(key.kind) {
None
let with_deps = |task_deps| K::with_deps(task_deps, || task(cx, arg));
let (result, edges) = if cx.dep_context().is_eval_always(key.kind) {
(with_deps(TaskDepsRef::EvalAlways), smallvec![])
} else {
Some(Lock::new(TaskDeps {
let task_deps = Lock::new(TaskDeps {
#[cfg(debug_assertions)]
node: Some(key),
reads: SmallVec::new(),
read_set: Default::default(),
phantom_data: PhantomData,
}))
});
(with_deps(TaskDepsRef::Allow(&task_deps)), task_deps.into_inner().reads)
};
let task_deps_ref =
task_deps.as_ref().map(TaskDepsRef::Allow).unwrap_or(TaskDepsRef::EvalAlways);
let result = K::with_deps(task_deps_ref, || task(cx, arg));
let edges = task_deps.map_or_else(|| smallvec![], |lock| lock.into_inner().reads);
let dcx = cx.dep_context();
let hashing_timer = dcx.profiler().incr_result_hashing();
let current_fingerprint =