Auto merge of #115819 - oli-obk:try_destructure_mir_constant_for_diagnostics_strikes_again, r=oli-obk

bors · bors · commit 3ad792d35bad · 2023-09-29T15:45:54.000Z
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. Hopefully gets rid of #83085 for good
diff --git a/compiler/rustc_const_eval/src/const_eval/mod.rs b/compiler/rustc_const_eval/src/const_eval/mod.rs
@@ -85,7 +85,7 @@ pub(crate) fn eval_to_valtree<'tcx>(
 }
 
 #[instrument(skip(tcx), level = "debug")]
-pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
+pub fn try_destructure_mir_constant_for_diagnostics<'tcx>(
     tcx: TyCtxt<'tcx>,
     val: ConstValue<'tcx>,
     ty: Ty<'tcx>,
diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh
@@ -10,7 +10,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 # Load extra environment variables
 vars="${EXTRA_VARIABLES-}"
-echo "${vars}" | jq '' >/dev/null  # Validate JSON and exit on errors
+echo "${vars}" | jq '.' >/dev/null  # Validate JSON and exit on errors
 for key in $(echo "${vars}" | jq "keys[]" -r); do
     # On Windows, for whatever reason, $key contains the BOM character in it,
     # and that messes up `jq ".${key}"`. This line strips the BOM from the key.
diff --git a/src/tools/clippy/clippy_utils/src/consts.rs b/src/tools/clippy/clippy_utils/src/consts.rs
@@ -724,7 +724,7 @@ fn field_of_struct<'tcx>(
     field: &Ident,
 ) -> Option<mir::ConstantKind<'tcx>> {
     if let mir::ConstantKind::Val(result, ty) = result
-        && let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_diagnostics((result, ty))
+        && let Some(dc) = rustc_const_eval::const_eval::try_destructure_mir_constant_for_diagnostics(lcx.tcx, result, ty)
         && let Some(dc_variant) = dc.variant
         && let Some(variant) = adt_def.variants().get(dc_variant)
         && let Some(field_idx) = variant.fields.iter().position(|el| el.name == field.name)

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ pub(crate) fn eval_to_valtree<'tcx>(`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`#[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>(`
`89`	`89`	`tcx: TyCtxt<'tcx>,`
`90`	`90`	`val: ConstValue<'tcx>,`
`91`	`91`	`ty: Ty<'tcx>,`