Skip to content

Commit 6564403

Browse files
author
Niko Matsakis
committed
pacify merciless fmt
1 parent b535061 commit 6564403

File tree

1 file changed

+5
-5
lines changed
  • compiler/rustc_mir_build/src/builder

1 file changed

+5
-5
lines changed

compiler/rustc_mir_build/src/builder/scope.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1396,9 +1396,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
13961396
}
13971397

13981398
/// Builds drops for `pop_scope` and `leave_top_scope`.
1399-
///
1399+
///
14001400
/// # Parameters
1401-
///
1401+
///
14021402
/// * `unwind_drops`, the drop tree data structure storing what needs to be cleaned up if unwind occurs
14031403
/// * `scope`, describes the drops that will occur on exiting the scope in regular execution
14041404
/// * `block`, the block to branch to once drops are complete (assuming no unwind occurs)
@@ -1436,14 +1436,14 @@ fn build_scope_drops<'tcx>(
14361436
// statement. For other functions we don't worry about StorageDead. The
14371437
// drops for the unwind path should have already been generated by
14381438
// `diverge_cleanup_gen`.
1439-
1439+
14401440
// `unwind_to` indicates what needs to be dropped should unwinding occur.
14411441
// This is a subset of what needs to be dropped when exiting the scope.
14421442
// As we unwind the scope, we will also move `unwind_to` backwards to match,
14431443
// so that we can use it should a destructor panic.
14441444
let mut unwind_to = unwind_to;
14451445

1446-
// The block that we should jump to after drops complete. We start by building the final drop (`drops[n]`
1446+
// The block that we should jump to after drops complete. We start by building the final drop (`drops[n]`
14471447
// in the diagram above) and then build the drops (e.g., `drop[1]`, `drop[0]`) that come before it.
14481448
// block begins as the successor of `drops[n]` and then becomes `drops[n]` so that `drops[n-1]`
14491449
// will branch to `drops[n]`.
@@ -1492,7 +1492,7 @@ fn build_scope_drops<'tcx>(
14921492
continue;
14931493
}
14941494

1495-
// As in the `DropKind::Storage` case below:
1495+
// As in the `DropKind::Storage` case below:
14961496
// normally lint-related drops are not emitted for unwind,
14971497
// so we can just leave `unwind_to` unmodified, but in some
14981498
// cases we emit things ALSO on the unwind path, so we need to adjust

0 commit comments

Comments
 (0)