diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-11-01 21:40:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 21:40:06 +0100 |
| commit | 4e437be0441cb5d26f7fa6c2bfc40f3b2aee30a6 (patch) | |
| tree | e7a76d03f22b4b19ca46d3258298ca1dc20fbfb5 /src | |
| parent | 3087b63d1f305690b2146ba5f0d7295630e60ca9 (diff) | |
| parent | f512f91258a8df420598c968b604a922d277ea99 (diff) | |
| download | rust-4e437be0441cb5d26f7fa6c2bfc40f3b2aee30a6.tar.gz rust-4e437be0441cb5d26f7fa6c2bfc40f3b2aee30a6.zip | |
Rollup merge of #117441 - cjgillot:diag-noassert, r=oli-obk,RalfJung
Do not assert in op_to_const. `op_to_const` is used in `try_destructure_mir_constant_for_diagnostics`, which may encounter invalid constants created by optimizations and debugging. r? ``@oli-obk`` Fixes https://github.com/rust-lang/rust/issues/117368
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/consts.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/clippy/clippy_utils/src/consts.rs b/src/tools/clippy/clippy_utils/src/consts.rs index 79c04c7c7f4..50a73745acb 100644 --- a/src/tools/clippy/clippy_utils/src/consts.rs +++ b/src/tools/clippy/clippy_utils/src/consts.rs @@ -710,7 +710,7 @@ fn field_of_struct<'tcx>( field: &Ident, ) -> Option<mir::Const<'tcx>> { if let mir::Const::Val(result, ty) = result - && let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_diagnostics(result, ty) + && let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_user_output(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) |