bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #132060 - joshtriplett:innermost-outermost, r=jieyouxu

Browse source 
"innermost", "outermost", "leftmost", and "rightmost" don't need hyphens

These are all standard dictionary words and don't require hyphenation.

-----

Encountered an instance of this in error messages and it bugged me, so I
figured I'd fix it across the entire codebase.
This commit is contained in:
León Orell Valerian Liehr 2024-10-23 22:11:05 +02:00 • committed by GitHub
commit 8b1141a5c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_mir_build/src/build/scope.rs
View file

@ -1048,8 +1048,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// | +------------|outer_scope cache|--+ |
// +------------------------------|middle_scope cache|------+
//
// Now, a new, inner-most scope is added along with a new drop into
// both inner-most and outer-most scopes:
// Now, a new, innermost scope is added along with a new drop into
// both innermost and outermost scopes:
//
// +------------------------------------------------------------+
// | +----------------------------------+ |
@ -1061,11 +1061,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// +----=----------------|invalid middle_scope cache|-----------+
//
// If, when adding `drop(new)` we do not invalidate the cached blocks for both
// outer_scope and middle_scope, then, when building drops for the inner (right-most)
// outer_scope and middle_scope, then, when building drops for the inner (rightmost)
// scope, the old, cached blocks, without `drop(new)` will get used, producing the
// wrong results.
//
// Note that this code iterates scopes from the inner-most to the outer-most,
// Note that this code iterates scopes from the innermost to the outermost,
// invalidating caches of each scope visited. This way bare minimum of the
// caches gets invalidated. i.e., if a new drop is added into the middle scope, the
// cache of outer scope stays intact.