mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style nits

Browse Source 
Co-authored-by: David Tolnay <dtolnay@gmail.com>
This commit is contained in:
Christopher Durham 2023-09-28 23:18:55 -04:00
parent 8047f8fb51
commit 3d448bd067
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/alloc/src/string.rs
View File

@ -741,7 +741,7 @@ pub fn from_utf16le(v: &[u8]) -> Result<String, FromUtf16Error> {
return Err(FromUtf16Error(())); return Err(FromUtf16Error(()));
} }
match (cfg!(target_endian = "little"), unsafe { v.align_to::<u16>() }) { match (cfg!(target_endian = "little"), unsafe { v.align_to::<u16>() }) {
(true, (&[], v, &[])) => Self::from_utf16(v), (true, ([], v, [])) => Self::from_utf16(v),
_ => decode_utf16(v.array_chunks::<2>().copied().map(u16::from_le_bytes)) _ => decode_utf16(v.array_chunks::<2>().copied().map(u16::from_le_bytes))
.collect::<Result<_, _>>() .collect::<Result<_, _>>()
.map_err(|_| FromUtf16Error(())), .map_err(|_| FromUtf16Error(())),
@ -777,8 +777,8 @@ pub fn from_utf16le(v: &[u8]) -> Result<String, FromUtf16Error> {
#[unstable(feature = "str_from_utf16_endian", issue = "none", reason = "recently added")] #[unstable(feature = "str_from_utf16_endian", issue = "none", reason = "recently added")]
pub fn from_utf16le_lossy(v: &[u8]) -> String { pub fn from_utf16le_lossy(v: &[u8]) -> String {
match (cfg!(target_endian = "little"), unsafe { v.align_to::<u16>() }) { match (cfg!(target_endian = "little"), unsafe { v.align_to::<u16>() }) {
(true, (&[], v, &[])) => Self::from_utf16_lossy(v), (true, ([], v, [])) => Self::from_utf16_lossy(v),
(true, (&[], v, &[_remainder])) => Self::from_utf16_lossy(v) + "\u{FFFD}", (true, ([], v, [_remainder])) => Self::from_utf16_lossy(v) + "\u{FFFD}",
_ => { _ => {
let mut iter = v.array_chunks::<2>(); let mut iter = v.array_chunks::<2>();
let string = decode_utf16(iter.by_ref().copied().map(u16::from_le_bytes)) let string = decode_utf16(iter.by_ref().copied().map(u16::from_le_bytes))
@ -816,7 +816,7 @@ pub fn from_utf16be(v: &[u8]) -> Result<String, FromUtf16Error> {
return Err(FromUtf16Error(())); return Err(FromUtf16Error(()));
} }
match (cfg!(target_endian = "big"), unsafe { v.align_to::<u16>() }) { match (cfg!(target_endian = "big"), unsafe { v.align_to::<u16>() }) {
(true, (&[], v, &[])) => Self::from_utf16(v), (true, ([], v, [])) => Self::from_utf16(v),
_ => decode_utf16(v.array_chunks::<2>().copied().map(u16::from_be_bytes)) _ => decode_utf16(v.array_chunks::<2>().copied().map(u16::from_be_bytes))
.collect::<Result<_, _>>() .collect::<Result<_, _>>()
.map_err(|_| FromUtf16Error(())), .map_err(|_| FromUtf16Error(())),
@ -852,8 +852,8 @@ pub fn from_utf16be(v: &[u8]) -> Result<String, FromUtf16Error> {
#[unstable(feature = "str_from_utf16_endian", issue = "none", reason = "recently added")] #[unstable(feature = "str_from_utf16_endian", issue = "none", reason = "recently added")]
pub fn from_utf16be_lossy(v: &[u8]) -> String { pub fn from_utf16be_lossy(v: &[u8]) -> String {
match (cfg!(target_endian = "big"), unsafe { v.align_to::<u16>() }) { match (cfg!(target_endian = "big"), unsafe { v.align_to::<u16>() }) {
(true, (&[], v, &[])) => Self::from_utf16_lossy(v), (true, ([], v, [])) => Self::from_utf16_lossy(v),
(true, (&[], v, &[_remainder])) => Self::from_utf16_lossy(v) + "\u{FFFD}", (true, ([], v, [_remainder])) => Self::from_utf16_lossy(v) + "\u{FFFD}",
_ => { _ => {
let mut iter = v.array_chunks::<2>(); let mut iter = v.array_chunks::<2>();
let string = decode_utf16(iter.by_ref().copied().map(u16::from_be_bytes)) let string = decode_utf16(iter.by_ref().copied().map(u16::from_be_bytes))