From 7bb229ff3ff540851ad58c47b6b745de3badabfc Mon Sep 17 00:00:00 2001 From: Henri Sivonen Date: Fri, 6 Sep 2019 11:56:20 +0300 Subject: [PATCH] Fix wrong UTF name in internal function naming. --- src/mem.rs | 4 ++-- src/utf_8.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mem.rs b/src/mem.rs index bffc20e..354d8e9 100644 --- a/src/mem.rs +++ b/src/mem.rs @@ -1627,12 +1627,12 @@ pub fn convert_utf16_to_utf8_partial(src: &[u16], dst: &mut [u8]) -> (usize, usi // Letting the transitions be mere intra-function jumps, even to // basic blocks out-of-lined to the end of the function would wipe // away a quarter of Arabic encode performance on Haswell! - let (read, written) = convert_utf16_to_utf16_partial_inner(src, dst); + let (read, written) = convert_utf16_to_utf8_partial_inner(src, dst); if unsafe { likely(read == src.len()) } { return (read, written); } let (tail_read, tail_written) = - convert_utf16_to_utf16_partial_tail(&src[read..], &mut dst[written..]); + convert_utf16_to_utf8_partial_tail(&src[read..], &mut dst[written..]); (read + tail_read, written + tail_written) } diff --git a/src/utf_8.rs b/src/utf_8.rs index a47731e..099b4b1 100644 --- a/src/utf_8.rs +++ b/src/utf_8.rs @@ -616,7 +616,7 @@ impl Utf8Decoder { #[cfg_attr(feature = "cargo-clippy", allow(never_loop))] #[inline(never)] -pub fn convert_utf16_to_utf16_partial_inner(src: &[u16], dst: &mut [u8]) -> (usize, usize) { +pub fn convert_utf16_to_utf8_partial_inner(src: &[u16], dst: &mut [u8]) -> (usize, usize) { let mut read = 0; let mut written = 0; 'outer: loop { @@ -755,7 +755,7 @@ pub fn convert_utf16_to_utf16_partial_inner(src: &[u16], dst: &mut [u8]) -> (usi } #[inline(never)] -pub fn convert_utf16_to_utf16_partial_tail(src: &[u16], dst: &mut [u8]) -> (usize, usize) { +pub fn convert_utf16_to_utf8_partial_tail(src: &[u16], dst: &mut [u8]) -> (usize, usize) { // Everything below is cold code! let mut read = 0; let mut written = 0;