Skip to content

Commit bbb38ea

Browse files
committed
Expose try_destructure_mir_constant_for_diagnostics directly to clippy
Otherwise clippy tries to use the query in ways that incremental caching will inevitably cause problems with.
1 parent 735bb7e commit bbb38ea

File tree

2 files changed

+2
-2
lines changed
  • compiler/rustc_const_eval/src/const_eval
  • src/tools/clippy/clippy_utils/src

2 files changed

+2
-2
lines changed

compiler/rustc_const_eval/src/const_eval/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub(crate) fn eval_to_valtree<'tcx>(
8585
}
8686

8787
#[instrument(skip(tcx), level = "debug")]
88-
pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
88+
pub fn try_destructure_mir_constant_for_diagnostics<'tcx>(
8989
tcx: TyCtxt<'tcx>,
9090
val: ConstValue<'tcx>,
9191
ty: Ty<'tcx>,

src/tools/clippy/clippy_utils/src/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ fn field_of_struct<'tcx>(
724724
field: &Ident,
725725
) -> Option<mir::ConstantKind<'tcx>> {
726726
if let mir::ConstantKind::Val(result, ty) = result
727-
&& let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_diagnostics((result, ty))
727+
&& let Some(dc) = rustc_const_eval::const_eval::try_destructure_mir_constant_for_diagnostics(lcx.tcx, result, ty)
728728
&& let Some(dc_variant) = dc.variant
729729
&& let Some(variant) = adt_def.variants().get(dc_variant)
730730
&& let Some(field_idx) = variant.fields.iter().position(|el| el.name == field.name)

0 commit comments

Comments
 (0)