diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-26 18:51:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 18:51:41 +0200 |
| commit | 9babe98562745dbdd6d7d376a004f91078cbe35e (patch) | |
| tree | 0c1bcefc27f7a7a7c9701831684348e00cfd9c05 /library/alloc/src | |
| parent | ea8bd06b56bd34098b315f811d911a1d4ad9cb5d (diff) | |
| parent | 9a55e9edc57fa939185542be7e2d5b89418c78c9 (diff) | |
| download | rust-9babe98562745dbdd6d7d376a004f91078cbe35e.tar.gz rust-9babe98562745dbdd6d7d376a004f91078cbe35e.zip | |
Rollup merge of #110419 - jsoref:spelling-library, r=jyn514
Spelling library Split per https://github.com/rust-lang/rust/pull/110392 I can squash once people are happy w/ the changes. It's really uncommon for large sets of changes to be perfectly acceptable w/o at least some changes. I probably won't have time to respond until tomorrow or the next day
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/vec_deque/spec_from_iter.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/str.rs | 6 | ||||
| -rw-r--r-- | library/alloc/src/vec/in_place_collect.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/library/alloc/src/collections/vec_deque/spec_from_iter.rs b/library/alloc/src/collections/vec_deque/spec_from_iter.rs index 7650492ebda..2708c7fe102 100644 --- a/library/alloc/src/collections/vec_deque/spec_from_iter.rs +++ b/library/alloc/src/collections/vec_deque/spec_from_iter.rs @@ -12,7 +12,7 @@ where default fn spec_from_iter(iterator: I) -> Self { // Since converting is O(1) now, just re-use the `Vec` logic for // anything where we can't do something extra-special for `VecDeque`, - // especially as that could save us some monomorphiziation work + // especially as that could save us some monomorphization work // if one uses the same iterators (like slice ones) with both. crate::vec::Vec::from_iter(iterator).into() } diff --git a/library/alloc/src/str.rs b/library/alloc/src/str.rs index b87ef59f64a..84977409904 100644 --- a/library/alloc/src/str.rs +++ b/library/alloc/src/str.rs @@ -404,12 +404,12 @@ impl str { // See https://www.unicode.org/versions/Unicode7.0.0/ch03.pdf#G33992 // for the definition of `Final_Sigma`. debug_assert!('Σ'.len_utf8() == 2); - let is_word_final = case_ignoreable_then_cased(from[..i].chars().rev()) - && !case_ignoreable_then_cased(from[i + 2..].chars()); + let is_word_final = case_ignorable_then_cased(from[..i].chars().rev()) + && !case_ignorable_then_cased(from[i + 2..].chars()); to.push_str(if is_word_final { "ς" } else { "σ" }); } - fn case_ignoreable_then_cased<I: Iterator<Item = char>>(iter: I) -> bool { + fn case_ignorable_then_cased<I: Iterator<Item = char>>(iter: I) -> bool { use core::unicode::{Case_Ignorable, Cased}; match iter.skip_while(|&c| Case_Ignorable(c)).next() { Some(c) => Cased(c), diff --git a/library/alloc/src/vec/in_place_collect.rs b/library/alloc/src/vec/in_place_collect.rs index 87d61deb1eb..2f1ee8b0353 100644 --- a/library/alloc/src/vec/in_place_collect.rs +++ b/library/alloc/src/vec/in_place_collect.rs @@ -201,7 +201,7 @@ where // // Note: This access to the source wouldn't be allowed by the TrustedRandomIteratorNoCoerce // contract (used by SpecInPlaceCollect below). But see the "O(1) collect" section in the - // module documenttation why this is ok anyway. + // module documentation why this is ok anyway. let dst_guard = InPlaceDstBufDrop { ptr: dst_buf, len, cap }; src.forget_allocation_drop_remaining(); mem::forget(dst_guard); |
