about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2023-09-12 07:49:25 +0200
committerRalf Jung <post@ralfj.de>2023-09-14 07:27:30 +0200
commitb2d5d68c58a745c80bc0187dba8c85e1519faabc (patch)
tree5db410f35482cd314b2ff742cb007ba9bd5f5259
parent2aaaeb4e8166cf7ba52cf606eec2219730a06395 (diff)
downloadrust-b2d5d68c58a745c80bc0187dba8c85e1519faabc.tar.gz
rust-b2d5d68c58a745c80bc0187dba8c85e1519faabc.zip
cleanup op_to_const a bit; rename ConstValue::ByRef → Indirect
-rw-r--r--clippy_lints/src/utils/internal_lints/unnecessary_def_path.rs2
-rw-r--r--clippy_utils/src/consts.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/utils/internal_lints/unnecessary_def_path.rs b/clippy_lints/src/utils/internal_lints/unnecessary_def_path.rs
index f66f33fee16..4a5b6fa5c18 100644
--- a/clippy_lints/src/utils/internal_lints/unnecessary_def_path.rs
+++ b/clippy_lints/src/utils/internal_lints/unnecessary_def_path.rs
@@ -232,7 +232,7 @@ fn path_to_matched_type(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> Option<Ve
                 cx.tcx.type_of(def_id).instantiate_identity(),
             ),
             Res::Def(DefKind::Const, def_id) => match cx.tcx.const_eval_poly(def_id).ok()? {
-                ConstValue::ByRef { alloc, offset } if offset.bytes() == 0 => {
+                ConstValue::Indirect { alloc, offset } if offset.bytes() == 0 => {
                     read_mir_alloc_def_path(cx, alloc.inner(), cx.tcx.type_of(def_id).instantiate_identity())
                 },
                 _ => None,
diff --git a/clippy_utils/src/consts.rs b/clippy_utils/src/consts.rs
index 03341feffb8..61b944667a4 100644
--- a/clippy_utils/src/consts.rs
+++ b/clippy_utils/src/consts.rs
@@ -684,7 +684,7 @@ pub fn miri_to_const<'tcx>(lcx: &LateContext<'tcx>, result: mir::ConstantKind<'t
             },
             _ => None,
         },
-        mir::ConstantKind::Val(ConstValue::ByRef { alloc_id, offset: _ }, _) => {
+        mir::ConstantKind::Val(ConstValue::Indirect { alloc_id, offset: _ }, _) => {
             let alloc = lcx.tcx.global_alloc(alloc_id).unwrap_memory();
             match result.ty().kind() {
                 ty::Adt(adt_def, _) if adt_def.is_struct() => Some(Constant::Adt(result)),