diff options
| author | Paul Daniel Faria <Nashenas88@users.noreply.github.com> | 2019-12-02 09:40:03 -0500 |
|---|---|---|
| committer | Paul Daniel Faria <Nashenas88@users.noreply.github.com> | 2019-12-02 09:40:03 -0500 |
| commit | 3eaad564d25402013bdf5591c453c916b49cdf93 (patch) | |
| tree | 5b49bb9f8aee44cee162c323fa35e4a5a2df6c64 | |
| parent | 6123478f2a7f51b5fc7eecbd6d6498ae3ddbadfb (diff) | |
Fix issues caused during rebasing
| -rw-r--r-- | src/librustc_mir/transform/check_consts/validation.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/transform/promote_consts.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/check_consts/validation.rs b/src/librustc_mir/transform/check_consts/validation.rs index 86e1d6584fc..9d477bfbae8 100644 --- a/src/librustc_mir/transform/check_consts/validation.rs +++ b/src/librustc_mir/transform/check_consts/validation.rs @@ -342,7 +342,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> { | Rvalue::Ref(_, kind @ BorrowKind::Mut { .. }, ref place) | Rvalue::Ref(_, kind @ BorrowKind::Unique, ref place) => { - let ty = place.ty(self.body, self.tcx).ty; + let ty = place.ty(&*self.body, self.tcx).ty; let is_allowed = match ty.kind { // Inside a `static mut`, `&mut [...]` is allowed. ty::Array(..) | ty::Slice(_) if self.const_kind() == ConstKind::StaticMut diff --git a/src/librustc_mir/transform/promote_consts.rs b/src/librustc_mir/transform/promote_consts.rs index 73d224a944c..c99824bd356 100644 --- a/src/librustc_mir/transform/promote_consts.rs +++ b/src/librustc_mir/transform/promote_consts.rs @@ -1086,7 +1086,6 @@ pub fn promote_candidates<'tcx>( // FIXME: maybe try to filter this to avoid blowing up // memory usage? body.source_scopes.clone(), - body.source_scope_local_data.clone(), initial_locals, IndexVec::new(), 0, |