Skip to content

Commit

Permalink
Rollup merge of rust-lang#132060 - joshtriplett:innermost-outermost, …
Browse files Browse the repository at this point in the history
…r=jieyouxu

"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.
  • Loading branch information
fmease authored Oct 23, 2024
2 parents e62b2cc + 728a8d7 commit ded2a0a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion alloc/src/collections/btree/append.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl<K, V> Root<K, V> {
}
open_node.push(key, value, right_tree);

// Go down to the right-most leaf again.
// Go down to the rightmost leaf again.
cur_node = open_node.forget_type().last_leaf_edge().into_node();
}

Expand Down
2 changes: 1 addition & 1 deletion alloc/src/collections/btree/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ impl<K, V> Root<K, V> {
pub fn fix_right_border_of_plentiful(&mut self) {
let mut cur_node = self.borrow_mut();
while let Internal(internal) = cur_node.force() {
// Check if right-most child is underfull.
// Check if rightmost child is underfull.
let mut last_kv = internal.last_kv().consider_for_balancing();
debug_assert!(last_kv.left_child_len() >= MIN_LEN * 2);
let right_child_len = last_kv.right_child_len();
Expand Down
4 changes: 2 additions & 2 deletions alloc/src/collections/btree/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ impl<'a, K: 'a, V: 'a> BalancingContext<'a, K, V> {
right_node.val_area_mut(..count - 1),
);

// Move the left-most stolen pair to the parent.
// Move the leftmost stolen pair to the parent.
let k = left_node.key_area_mut(new_left_len).assume_init_read();
let v = left_node.val_area_mut(new_left_len).assume_init_read();
let (k, v) = self.parent.replace_kv(k, v);
Expand Down Expand Up @@ -1570,7 +1570,7 @@ impl<'a, K: 'a, V: 'a> BalancingContext<'a, K, V> {

// Move leaf data.
{
// Move the right-most stolen pair to the parent.
// Move the rightmost stolen pair to the parent.
let k = right_node.key_area_mut(count - 1).assume_init_read();
let v = right_node.val_area_mut(count - 1).assume_init_read();
let (k, v) = self.parent.replace_kv(k, v);
Expand Down
2 changes: 1 addition & 1 deletion core/src/iter/adapters/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub use self::{
/// this can be useful for specializing [`FromIterator`] implementations or recovering the
/// remaining elements after an iterator has been partially exhausted.
///
/// Note that implementations do not necessarily have to provide access to the inner-most
/// Note that implementations do not necessarily have to provide access to the innermost
/// source of a pipeline. A stateful intermediate adapter might eagerly evaluate a part
/// of the pipeline and expose its internal storage as source.
///
Expand Down

0 comments on commit ded2a0a

Please sign in to comment.