diff options
| author | bors <bors@rust-lang.org> | 2022-05-05 02:49:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-05 02:49:16 +0000 |
| commit | 7d3e03666a93bd2b0f78b3933f9305832af771a5 (patch) | |
| tree | 94da1941a3795bd5faf7ed469b1d2edc9bf9c1d0 /compiler/rustc_query_system | |
| parent | bdcb6a99e853732f8ec050ae4986aa3af51d44c5 (diff) | |
| parent | ade123275db92898b13faffea08893f0a6737ff4 (diff) | |
Auto merge of #96720 - JohnTitor:rollup-9jaaekr, r=JohnTitor
Rollup of 7 pull requests
Successful merges:
- #96603 (Enable full revision in const generics ui tests)
- #96616 (Relax memory ordering used in `min_stack`)
- #96619 (Relax memory ordering used in SameMutexCheck)
- #96628 (Stabilize `bool::then_some`)
- #96658 (Move callback to the () => {} syntax.)
- #96677 (Add more tests for label-break-value)
- #96697 (Enable tracing for all queries)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_system')
| -rw-r--r-- | compiler/rustc_query_system/src/lib.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_query_system/src/query/plumbing.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_query_system/src/lib.rs b/compiler/rustc_query_system/src/lib.rs index 6b70e9342fa..68284dcaa0b 100644 --- a/compiler/rustc_query_system/src/lib.rs +++ b/compiler/rustc_query_system/src/lib.rs @@ -1,5 +1,4 @@ #![feature(assert_matches)] -#![feature(bool_to_option)] #![feature(core_intrinsics)] #![feature(hash_raw_entry)] #![feature(let_else)] diff --git a/compiler/rustc_query_system/src/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs index 700290d67a4..3498df95196 100644 --- a/compiler/rustc_query_system/src/query/plumbing.rs +++ b/compiler/rustc_query_system/src/query/plumbing.rs @@ -675,6 +675,7 @@ where } } +#[derive(Debug)] pub enum QueryMode { Get, Ensure, @@ -697,7 +698,6 @@ where None }; - debug!("ty::query::get_query<{}>(key={:?}, span={:?})", Q::NAME, key, span); let (result, dep_node_index) = try_execute_query( tcx, Q::query_state(tcx), |