Skip to content

Commit

Permalink
Rollup merge of rust-lang#127303 - cuishuang:master, r=jhpratt
Browse files Browse the repository at this point in the history
chore: remove repeat words
  • Loading branch information
jhpratt authored Jul 4, 2024
2 parents 56c73c3 + 4df2059 commit de4f5c2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/src/hint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub const unsafe fn unreachable_unchecked() -> ! {
/// ```
///
/// This example is quite unlike anything that would be used in the real world: it is redundant
/// to put an an assertion right next to code that checks the same thing, and dereferencing a
/// to put an assertion right next to code that checks the same thing, and dereferencing a
/// pointer already has the builtin assumption that it is nonnull. However, it illustrates the
/// kind of changes the optimizer can make even when the behavior is less obviously related.
#[track_caller]
Expand Down
2 changes: 1 addition & 1 deletion core/src/slice/sort/stable/drift.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ fn logical_merge<T, F: FnMut(&T, &T) -> bool>(
// If one or both of the runs are sorted do a physical merge, using
// quicksort to sort the unsorted run if present. We also *need* to
// physically merge if the combined runs would not fit in the scratch space
// anymore (as this would mean we are no longer able to to quicksort them).
// anymore (as this would mean we are no longer able to quicksort them).
let len = v.len();
let can_fit_in_scratch = len <= scratch.len();
if !can_fit_in_scratch || left.sorted() || right.sorted() {
Expand Down

0 comments on commit de4f5c2

Please sign in to comment.