bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Unify &mut and &raw mut const-checking errors

Browse source
This commit is contained in:
Dylan MacKenzie 2020-10-01 11:03:16 -07:00
parent 2ad6187ce5
commit 77e6c56ab6
2 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -522,14 +522,16 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
if !is_allowed {
if let BorrowKind::Mut { .. } = kind {
self.check_op(ops::MutBorrow);
self.check_op(ops::MutBorrow(hir::BorrowKind::Ref));
} else {
self.check_op(ops::CellBorrow);
}
}
}
Rvalue::AddressOf(Mutability::Mut, _) => self.check_op(ops::MutAddressOf),
Rvalue::AddressOf(Mutability::Mut, _) => {
self.check_op(ops::MutBorrow(hir::BorrowKind::Raw))
}
Rvalue::Ref(_, BorrowKind::Shared | BorrowKind::Shallow, ref place)
| Rvalue::AddressOf(Mutability::Not, ref place) => {