Newtype for FakeRead semi-traversable tuple

eggyal · eggyal · commit 28219e12ddfd · 2023-11-05T20:48:21.000Z
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@@ -14,9 +14,9 @@ use rustc_middle::hir::nested_filter::OnlyBodies;
 use rustc_middle::mir::tcx::PlaceTy;
 use rustc_middle::mir::{
     self, AggregateKind, BindingForm, BorrowKind, CallSource, ClearCrossCrate, ConstraintCategory,
-    FakeReadCause, LocalDecl, LocalInfo, LocalKind, Location, MutBorrowKind, Operand, Place,
-    PlaceRef, ProjectionElem, Rvalue, Statement, StatementKind, Terminator, TerminatorKind,
-    VarBindingForm,
+    FakeReadCause, FakeReadCauseAndPlace, LocalDecl, LocalInfo, LocalKind, Location, MutBorrowKind,
+    Operand, Place, PlaceRef, ProjectionElem, Rvalue, Statement, StatementKind, Terminator,
+    TerminatorKind, VarBindingForm,
 };
 use rustc_middle::ty::{self, suggest_constraining_type_params, PredicateKind, Ty};
 use rustc_middle::util::CallKind;
@@ -3010,9 +3010,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         impl<'tcx> Visitor<'tcx> for FakeReadCauseFinder<'tcx> {
             fn visit_statement(&mut self, statement: &Statement<'tcx>, _: Location) {
                 match statement {
-                    Statement { kind: StatementKind::FakeRead(box (cause, place)), .. }
-                        if *place == self.place =>
-                    {
+                    Statement {
+                        kind: StatementKind::FakeRead(box FakeReadCauseAndPlace(cause, place)),
+                        ..
+                    } if *place == self.place => {
                         self.cause = Some(*cause);
                     }
                     _ => (),
diff --git a/compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs b/compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs
@@ -6,8 +6,8 @@ use rustc_hir::intravisit::Visitor;
 use rustc_index::IndexSlice;
 use rustc_infer::infer::NllRegionVariableOrigin;
 use rustc_middle::mir::{
-    Body, CallSource, CastKind, ConstraintCategory, FakeReadCause, Local, LocalInfo, Location,
-    Operand, Place, Rvalue, Statement, StatementKind, TerminatorKind,
+    Body, CallSource, CastKind, ConstraintCategory, FakeReadCause, FakeReadCauseAndPlace, Local,
+    LocalInfo, Location, Operand, Place, Rvalue, Statement, StatementKind, TerminatorKind,
 };
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::{self, RegionVid, TyCtxt};
@@ -477,7 +477,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 let block = &self.body.basic_blocks[location.block];
 
                 let kind = if let Some(&Statement {
-                    kind: StatementKind::FakeRead(box (FakeReadCause::ForLet(_), place)),
+                    kind:
+                        StatementKind::FakeRead(box FakeReadCauseAndPlace(
+                            FakeReadCause::ForLet(_),
+                            place,
+                        )),
                     ..
                 }) = block.statements.get(location.statement_index)
                 {
diff --git a/compiler/rustc_borrowck/src/diagnostics/mod.rs b/compiler/rustc_borrowck/src/diagnostics/mod.rs
@@ -13,9 +13,9 @@ use rustc_index::IndexSlice;
 use rustc_infer::infer::LateBoundRegionConversionTime;
 use rustc_middle::mir::tcx::PlaceTy;
 use rustc_middle::mir::{
-    AggregateKind, CallSource, ConstOperand, FakeReadCause, Local, LocalInfo, LocalKind, Location,
-    Operand, Place, PlaceRef, ProjectionElem, Rvalue, Statement, StatementKind, Terminator,
-    TerminatorKind,
+    AggregateKind, CallSource, ConstOperand, FakeReadCause, FakeReadCauseAndPlace, Local,
+    LocalInfo, LocalKind, Location, Operand, Place, PlaceRef, ProjectionElem, Rvalue, Statement,
+    StatementKind, Terminator, TerminatorKind,
 };
 use rustc_middle::ty::print::Print;
 use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
@@ -797,7 +797,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
         // StatementKind::FakeRead only contains a def_id if they are introduced as a result
         // of pattern matching within a closure.
-        if let StatementKind::FakeRead(box (cause, place)) = stmt.kind {
+        if let StatementKind::FakeRead(box FakeReadCauseAndPlace(cause, place)) = stmt.kind {
             match cause {
                 FakeReadCause::ForMatchedPlace(Some(closure_def_id))
                 | FakeReadCause::ForLet(Some(closure_def_id)) => {
diff --git a/compiler/rustc_borrowck/src/invalidation.rs b/compiler/rustc_borrowck/src/invalidation.rs
@@ -62,7 +62,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {
 
                 self.mutate_place(location, *lhs, Shallow(None));
             }
-            StatementKind::FakeRead(box (_, _)) => {
+            StatementKind::FakeRead(_) => {
                 // Only relevant for initialized/liveness/safety checks.
             }
             StatementKind::Intrinsic(box NonDivergingIntrinsic::Assume(op)) => {
diff --git a/compiler/rustc_borrowck/src/lib.rs b/compiler/rustc_borrowck/src/lib.rs
@@ -629,7 +629,7 @@ impl<'cx, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx, R> for MirBorro
 
                 self.mutate_place(location, (*lhs, span), Shallow(None), flow_state);
             }
-            StatementKind::FakeRead(box (_, place)) => {
+            StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {
                 // Read for match doesn't access any memory and is used to
                 // assert that a place is safe and live. So we don't have to
                 // do any checks here.
diff --git a/compiler/rustc_middle/src/mir/pretty.rs b/compiler/rustc_middle/src/mir/pretty.rs
@@ -680,7 +680,7 @@ impl Debug for Statement<'_> {
         use self::StatementKind::*;
         match self.kind {
             Assign(box (ref place, ref rv)) => write!(fmt, "{place:?} = {rv:?}"),
-            FakeRead(box (ref cause, ref place)) => {
+            FakeRead(box FakeReadCauseAndPlace(ref cause, ref place)) => {
                 write!(fmt, "FakeRead({cause:?}, {place:?})")
             }
             Retag(ref kind, ref place) => write!(
diff --git a/compiler/rustc_middle/src/mir/syntax.rs b/compiler/rustc_middle/src/mir/syntax.rs
@@ -288,7 +288,7 @@ pub enum StatementKind<'tcx> {
     /// When executed at runtime this is a nop.
     ///
     /// Disallowed after drop elaboration.
-    FakeRead(Box<(FakeReadCause, Place<'tcx>)>),
+    FakeRead(Box<FakeReadCauseAndPlace<'tcx>>),
 
     /// Write the discriminant for a variant to the enum Place.
     ///
@@ -459,6 +459,10 @@ pub enum RetagKind {
     Default,
 }
 
+#[derive(Copy, Clone, TyEncodable, TyDecodable, Debug, Hash, HashStable, PartialEq)]
+#[derive(TypeFoldable, TypeVisitable)]
+pub struct FakeReadCauseAndPlace<'tcx>(pub FakeReadCause, pub Place<'tcx>);
+
 /// The `FakeReadCause` describes the type of pattern why a FakeRead statement exists.
 #[derive(Copy, Clone, TyEncodable, TyDecodable, Debug, Hash, HashStable, PartialEq)]
 pub enum FakeReadCause {
diff --git a/compiler/rustc_middle/src/mir/visit.rs b/compiler/rustc_middle/src/mir/visit.rs
@@ -379,7 +379,7 @@ macro_rules! make_mir_visitor {
                     ) => {
                         self.visit_assign(place, rvalue, location);
                     }
-                    StatementKind::FakeRead(box (_, place)) => {
+                    StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {
                         self.visit_place(
                             place,
                             PlaceContext::NonMutatingUse(NonMutatingUseContext::Inspect),
diff --git a/compiler/rustc_mir_build/src/build/cfg.rs b/compiler/rustc_mir_build/src/build/cfg.rs
@@ -85,7 +85,7 @@ impl<'tcx> CFG<'tcx> {
         cause: FakeReadCause,
         place: Place<'tcx>,
     ) {
-        let kind = StatementKind::FakeRead(Box::new((cause, place)));
+        let kind = StatementKind::FakeRead(Box::new(FakeReadCauseAndPlace(cause, place)));
         let stmt = Statement { source_info, kind };
         self.push(block, stmt);
     }
diff --git a/compiler/rustc_mir_dataflow/src/move_paths/builder.rs b/compiler/rustc_mir_dataflow/src/move_paths/builder.rs
@@ -376,7 +376,7 @@ impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {
                 }
                 self.gather_rvalue(rval);
             }
-            StatementKind::FakeRead(box (_, place)) => {
+            StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {
                 self.create_move_path(*place);
             }
             StatementKind::StorageLive(_) => {}
diff --git a/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs b/compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
@@ -1,7 +1,7 @@
 use rustc_data_structures::captures::Captures;
 use rustc_middle::mir::{
-    self, AggregateKind, FakeReadCause, Rvalue, Statement, StatementKind, Terminator,
-    TerminatorKind,
+    self, AggregateKind, FakeReadCause, FakeReadCauseAndPlace, Rvalue, Statement, StatementKind,
+    Terminator, TerminatorKind,
 };
 use rustc_span::Span;
 
@@ -120,10 +120,10 @@ fn filtered_statement_span(statement: &Statement<'_>) -> Option<Span> {
         // and `_1` is the `Place` for `somenum`.
         //
         // If and when the Issue is resolved, remove this special case match pattern:
-        StatementKind::FakeRead(box (FakeReadCause::ForGuardBinding, _)) => None,
+        StatementKind::FakeRead(box FakeReadCauseAndPlace(FakeReadCause::ForGuardBinding, _)) => None,
 
         // Retain spans from all other statements
-        StatementKind::FakeRead(box (_, _)) // Not including `ForGuardBinding`
+        StatementKind::FakeRead(_) // Not including `ForGuardBinding`
         | StatementKind::Intrinsic(..)
         | StatementKind::Assign(_)
         | StatementKind::SetDiscriminant { .. }
diff --git a/compiler/rustc_mir_transform/src/remove_zsts.rs b/compiler/rustc_mir_transform/src/remove_zsts.rs
@@ -113,7 +113,7 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {
             | StatementKind::AscribeUserType(box (place, _), _)
             | StatementKind::Retag(_, box place)
             | StatementKind::PlaceMention(box place)
-            | StatementKind::FakeRead(box (_, place)) => Some(place),
+            | StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => Some(place),
             StatementKind::StorageLive(local) | StatementKind::StorageDead(local) => {
                 Some(local.into())
             }
diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
@@ -12,7 +12,7 @@ use rustc_hir::def_id::DefId;
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_infer::traits::Obligation;
 use rustc_middle::mir::{
-    Body, CastKind, NonDivergingIntrinsic, NullOp, Operand, Place, ProjectionElem, Rvalue, Statement, StatementKind,
+    Body, CastKind, FakeReadCauseAndPlace, NonDivergingIntrinsic, NullOp, Operand, Place, ProjectionElem, Rvalue, Statement, StatementKind,
     Terminator, TerminatorKind,
 };
 use rustc_middle::traits::{BuiltinImplSource, ImplSource, ObligationCause};
@@ -207,7 +207,7 @@ fn check_statement<'tcx>(
             check_rvalue(tcx, body, def_id, rval, span)
         },
 
-        StatementKind::FakeRead(box (_, place)) => check_place(tcx, *place, span, body),
+        StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => check_place(tcx, *place, span, body),
         // just an assignment
         StatementKind::SetDiscriminant { place, .. } | StatementKind::Deinit(place) => {
             check_place(tcx, **place, span, body)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {`
`62`	`62`
`63`	`63`	`self.mutate_place(location, *lhs, Shallow(None));`
`64`	`64`	`}`
`65`		`- StatementKind::FakeRead(box (_, _)) => {`
	`65`	`+ StatementKind::FakeRead(_) => {`
`66`	`66`	`// Only relevant for initialized/liveness/safety checks.`
`67`	`67`	`}`
`68`	`68`	`StatementKind::Intrinsic(box NonDivergingIntrinsic::Assume(op)) => {`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ impl<'cx, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx, R> for MirBorro`
`629`	`629`
`630`	`630`	`self.mutate_place(location, (*lhs, span), Shallow(None), flow_state);`
`631`	`631`	`}`
`632`		`- StatementKind::FakeRead(box (_, place)) => {`
	`632`	`+ StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {`
`633`	`633`	`// Read for match doesn't access any memory and is used to`
`634`	`634`	`// assert that a place is safe and live. So we don't have to`
`635`	`635`	`// do any checks here.`
Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ impl Debug for Statement<'_> {`
`680`	`680`	`use self::StatementKind::*;`
`681`	`681`	`match self.kind {`
`682`	`682`	`Assign(box (ref place, ref rv)) => write!(fmt, "{place:?} = {rv:?}"),`
`683`		`- FakeRead(box (ref cause, ref place)) => {`
	`683`	`+ FakeRead(box FakeReadCauseAndPlace(ref cause, ref place)) => {`
`684`	`684`	`write!(fmt, "FakeRead({cause:?}, {place:?})")`
`685`	`685`	`}`
`686`	`686`	`Retag(ref kind, ref place) => write!(`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ macro_rules! make_mir_visitor {`
`379`	`379`	`) => {`
`380`	`380`	`self.visit_assign(place, rvalue, location);`
`381`	`381`	`}`
`382`		`- StatementKind::FakeRead(box (_, place)) => {`
	`382`	`+ StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {`
`383`	`383`	`self.visit_place(`
`384`	`384`	`place,`
`385`	`385`	`PlaceContext::NonMutatingUse(NonMutatingUseContext::Inspect),`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ impl<'tcx> CFG<'tcx> {`
`85`	`85`	`cause: FakeReadCause,`
`86`	`86`	`place: Place<'tcx>,`
`87`	`87`	`) {`
`88`		`- let kind = StatementKind::FakeRead(Box::new((cause, place)));`
	`88`	`+ let kind = StatementKind::FakeRead(Box::new(FakeReadCauseAndPlace(cause, place)));`
`89`	`89`	`let stmt = Statement { source_info, kind };`
`90`	`90`	`self.push(block, stmt);`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {`
`376`	`376`	`}`
`377`	`377`	`self.gather_rvalue(rval);`
`378`	`378`	`}`
`379`		`- StatementKind::FakeRead(box (_, place)) => {`
	`379`	`+ StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => {`
`380`	`380`	`self.create_move_path(*place);`
`381`	`381`	`}`
`382`	`382`	`StatementKind::StorageLive(_) => {}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {`
`113`	`113`	`\| StatementKind::AscribeUserType(box (place, _), _)`
`114`	`114`	`\| StatementKind::Retag(_, box place)`
`115`	`115`	`\| StatementKind::PlaceMention(box place)`
`116`		`- \| StatementKind::FakeRead(box (_, place)) => Some(place),`
	`116`	`+ \| StatementKind::FakeRead(box FakeReadCauseAndPlace(_, place)) => Some(place),`
`117`	`117`	`StatementKind::StorageLive(local) \| StatementKind::StorageDead(local) => {`
`118`	`118`	`Some(local.into())`
`119`	`119`	`}`