diff options
| author | bors <bors@rust-lang.org> | 2021-12-11 03:52:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-11 03:52:12 +0000 |
| commit | c185610ebc19a0fc22e68472483dc69ea10b92fd (patch) | |
| tree | 6efde3cd2f3283600d3bd97a54a5b87ce3b21f37 /library/core/src | |
| parent | 82575a1d6f02a3932fcfa36562368f5e095d93ba (diff) | |
| parent | 637859b26ef431b2533d257184bd7a74ae278f8c (diff) | |
| download | rust-c185610ebc19a0fc22e68472483dc69ea10b92fd.tar.gz rust-c185610ebc19a0fc22e68472483dc69ea10b92fd.zip | |
Auto merge of #91761 - matthiaskrgr:rollup-bjowmvz, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #91668 (Remove the match on `ErrorKind::Other`) - #91678 (Add tests fixed by #90023) - #91679 (Move core/stream/stream/mod.rs to core/stream/stream.rs) - #91681 (fix typo in `intrinsics::raw_eq` docs) - #91686 (Fix `Vec::reserve_exact` documentation) - #91697 (Delete Utf8Lossy::from_str) - #91706 (Add unstable book entries for parts of asm that are not being stabilized) - #91709 (Replace iterator-based set construction by *Set::From<[T; N]>) - #91716 (Improve x.py logging and defaults a bit more) - #91747 (Add pierwill to .mailmap) - #91755 (Fix since attribute for const_linked_list_new feature) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/intrinsics.rs | 2 | ||||
| -rw-r--r-- | library/core/src/str/lossy.rs | 5 | ||||
| -rw-r--r-- | library/core/src/stream/stream.rs (renamed from library/core/src/stream/stream/mod.rs) | 0 |
3 files changed, 1 insertions, 6 deletions
diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs index 8c6a7a56966..f45ee7b6ee8 100644 --- a/library/core/src/intrinsics.rs +++ b/library/core/src/intrinsics.rs @@ -1919,7 +1919,7 @@ extern "rust-intrinsic" { /// Determines whether the raw bytes of the two values are equal. /// - /// The is particularly handy for arrays, since it allows things like just + /// This is particularly handy for arrays, since it allows things like just /// comparing `i96`s instead of forcing `alloca`s for `[6 x i16]`. /// /// Above some backend-decided threshold this will emit calls to `memcmp`, diff --git a/library/core/src/str/lossy.rs b/library/core/src/str/lossy.rs index 32bd22846e7..6ec1c93908f 100644 --- a/library/core/src/str/lossy.rs +++ b/library/core/src/str/lossy.rs @@ -13,11 +13,6 @@ pub struct Utf8Lossy { impl Utf8Lossy { #[must_use] - pub fn from_str(s: &str) -> &Utf8Lossy { - Utf8Lossy::from_bytes(s.as_bytes()) - } - - #[must_use] pub fn from_bytes(bytes: &[u8]) -> &Utf8Lossy { // SAFETY: Both use the same memory layout, and UTF-8 correctness isn't required. unsafe { mem::transmute(bytes) } diff --git a/library/core/src/stream/stream/mod.rs b/library/core/src/stream/stream.rs index d102619b8e5..d102619b8e5 100644 --- a/library/core/src/stream/stream/mod.rs +++ b/library/core/src/stream/stream.rs |