Skip to content

Commit cff1d37

Browse files
committed
Auto merge of #109852 - Nilstrieb:rollup-g3mgxxw, r=Nilstrieb
Rollup of 4 pull requests Successful merges: - #109839 (Improve grammar of Iterator.partition_in_place) - #109840 (Fix typo in std/src/os/fd/owned.rs) - #109844 (a couple clippy::complexity fixes) - #109846 (more clippy::complexity fixes (iter_kv_map, map_flatten, nonminimal_bool)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1924ba1 + 7021faf commit cff1d37

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/iter/traits/iterator.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2120,8 +2120,8 @@ pub trait Iterator {
21202120
///
21212121
/// # Current implementation
21222122
///
2123-
/// Current algorithms tries finding the first element for which the predicate evaluates
2124-
/// to false, and the last element for which it evaluates to true and repeatedly swaps them.
2123+
/// The current algorithm tries to find the first element for which the predicate evaluates
2124+
/// to false and the last element for which it evaluates to true, and repeatedly swaps them.
21252125
///
21262126
/// Time complexity: *O*(*n*)
21272127
///

std/src/os/fd/owned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl AsFd for OwnedFd {
268268
#[inline]
269269
fn as_fd(&self) -> BorrowedFd<'_> {
270270
// Safety: `OwnedFd` and `BorrowedFd` have the same validity
271-
// invariants, and the `BorrowdFd` is bounded by the lifetime
271+
// invariants, and the `BorrowedFd` is bounded by the lifetime
272272
// of `&self`.
273273
unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
274274
}

0 commit comments

Comments
 (0)