diff options
| author | bors <bors@rust-lang.org> | 2024-12-14 06:44:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-14 06:44:05 +0000 |
| commit | ed141926048597e3649bb238ca3dc417904cd56c (patch) | |
| tree | e57fc49671ca6275c543e6fc7e5c12932a3b45b4 /compiler/rustc_query_impl/src | |
| parent | a1740a9c3568e856f6aa12d83e008d38c9749d4b (diff) | |
| parent | 4efa98cf2d1659468d01e97a9c42c51b6f6ac44b (diff) | |
| download | rust-ed141926048597e3649bb238ca3dc417904cd56c.tar.gz rust-ed141926048597e3649bb238ca3dc417904cd56c.zip | |
Auto merge of #134294 - matthiaskrgr:rollup-anh6io8, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #134252 (Fix `Path::is_absolute` on Hermit) - #134254 (Fix building `std` for Hermit after `c_char` change) - #134255 (Update includes in `/library/core/src/error.rs`.) - #134261 (Document the symbol Visibility enum) - #134262 (Arbitrary self types v2: adjust diagnostic.) - #134265 (Rename `ty_def_id` so people will stop using it by accident) - #134271 (Arbitrary self types v2: better feature gate test) - #134274 (Add check-pass test for `&raw`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_impl/src')
| -rw-r--r-- | compiler/rustc_query_impl/src/plumbing.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index f72f656b2f8..1b12af62ea5 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -349,9 +349,9 @@ pub(crate) fn create_query_frame< hasher.finish::<Hash64>() }) }; - let ty_def_id = key.ty_def_id(); + let def_id_for_ty_in_cycle = key.def_id_for_ty_in_cycle(); - QueryStackFrame::new(description, span, def_id, def_kind, kind, ty_def_id, hash) + QueryStackFrame::new(description, span, def_id, def_kind, kind, def_id_for_ty_in_cycle, hash) } pub(crate) fn encode_query_results<'a, 'tcx, Q>( |