Skip to content

Commit d20da13

Browse files
committed
rustc_mir: don't rely on mir::LocalDecl visibility_scopes in the MIR borrowck.
1 parent 1525dc2 commit d20da13

File tree

1 file changed

+1
-5
lines changed
  • src/librustc_mir/borrow_check/nll/explain_borrow

1 file changed

+1
-5
lines changed

src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
273273
if mir.local_decls[local].name.is_some() {
274274
if let Some((WriteKind::StorageDeadOrDrop, place)) = kind_place {
275275
if let Place::Base(PlaceBase::Local(borrowed_local)) = place {
276-
let dropped_local_scope = mir.local_decls[local].visibility_scope;
277-
let borrowed_local_scope =
278-
mir.local_decls[*borrowed_local].visibility_scope;
279-
280-
if mir.is_sub_scope(borrowed_local_scope, dropped_local_scope)
276+
if mir.local_decls[*borrowed_local].name.is_some()
281277
&& local != *borrowed_local
282278
{
283279
should_note_order = true;

0 commit comments

Comments
 (0)