diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-10 06:47:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 06:47:50 +0100 |
| commit | 977d69fc1992b0cef8d8ff020261d5bf9ede7424 (patch) | |
| tree | 44575b3b7866d3d898ab0ad4b736aea7260d6f55 /src/librustc_mir/dataflow | |
| parent | 5a62acaf9e456280339f37ca2e43fcb277772a18 (diff) | |
| parent | b11cd0b587cc2a663ef358089a2d1cf709170371 (diff) | |
Rollup merge of #69714 - spastorino:place-ref-lifetime, r=oli-obk
Make PlaceRef take just one lifetime r? @eddyb
Diffstat (limited to 'src/librustc_mir/dataflow')
| -rw-r--r-- | src/librustc_mir/dataflow/move_paths/builder.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/dataflow/move_paths/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/src/librustc_mir/dataflow/move_paths/builder.rs index 7e36a3cf2bf..7c449ad1197 100644 --- a/src/librustc_mir/dataflow/move_paths/builder.rs +++ b/src/librustc_mir/dataflow/move_paths/builder.rs @@ -483,7 +483,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> { self.builder.data.loc_map[self.loc].push(move_out); } - fn gather_init(&mut self, place: PlaceRef<'cx, 'tcx>, kind: InitKind) { + fn gather_init(&mut self, place: PlaceRef<'tcx>, kind: InitKind) { debug!("gather_init({:?}, {:?})", self.loc, place); let mut place = place; diff --git a/src/librustc_mir/dataflow/move_paths/mod.rs b/src/librustc_mir/dataflow/move_paths/mod.rs index 6f6ba7dc271..593952bfa7c 100644 --- a/src/librustc_mir/dataflow/move_paths/mod.rs +++ b/src/librustc_mir/dataflow/move_paths/mod.rs @@ -312,7 +312,7 @@ impl MovePathLookup { // alternative will *not* create a MovePath on the fly for an // unknown place, but will rather return the nearest available // parent. - pub fn find(&self, place: PlaceRef<'_, '_>) -> LookupResult { + pub fn find(&self, place: PlaceRef<'_>) -> LookupResult { let mut result = self.locals[place.local]; for elem in place.projection.iter() { |
