@@ -742,7 +742,7 @@ impl String {
742
742
}
743
743
match ( cfg ! ( target_endian = "little" ) , unsafe { v. align_to :: < u16 > ( ) } ) {
744
744
( true , ( [ ] , v, [ ] ) ) => Self :: from_utf16 ( v) ,
745
- _ => decode_utf16 ( v. array_chunks :: < 2 > ( ) . copied ( ) . map ( u16:: from_le_bytes) )
745
+ _ => char :: decode_utf16 ( v. array_chunks :: < 2 > ( ) . copied ( ) . map ( u16:: from_le_bytes) )
746
746
. collect :: < Result < _ , _ > > ( )
747
747
. map_err ( |_| FromUtf16Error ( ( ) ) ) ,
748
748
}
@@ -781,8 +781,8 @@ impl String {
781
781
( true , ( [ ] , v, [ _remainder] ) ) => Self :: from_utf16_lossy ( v) + "\u{FFFD} " ,
782
782
_ => {
783
783
let mut iter = v. array_chunks :: < 2 > ( ) ;
784
- let string = decode_utf16 ( iter. by_ref ( ) . copied ( ) . map ( u16:: from_le_bytes) )
785
- . map ( |r| r. unwrap_or ( REPLACEMENT_CHARACTER ) )
784
+ let string = char :: decode_utf16 ( iter. by_ref ( ) . copied ( ) . map ( u16:: from_le_bytes) )
785
+ . map ( |r| r. unwrap_or ( char :: REPLACEMENT_CHARACTER ) )
786
786
. collect ( ) ;
787
787
if iter. remainder ( ) . is_empty ( ) { string } else { string + "\u{FFFD} " }
788
788
}
@@ -817,7 +817,7 @@ impl String {
817
817
}
818
818
match ( cfg ! ( target_endian = "big" ) , unsafe { v. align_to :: < u16 > ( ) } ) {
819
819
( true , ( [ ] , v, [ ] ) ) => Self :: from_utf16 ( v) ,
820
- _ => decode_utf16 ( v. array_chunks :: < 2 > ( ) . copied ( ) . map ( u16:: from_be_bytes) )
820
+ _ => char :: decode_utf16 ( v. array_chunks :: < 2 > ( ) . copied ( ) . map ( u16:: from_be_bytes) )
821
821
. collect :: < Result < _ , _ > > ( )
822
822
. map_err ( |_| FromUtf16Error ( ( ) ) ) ,
823
823
}
@@ -856,8 +856,8 @@ impl String {
856
856
( true , ( [ ] , v, [ _remainder] ) ) => Self :: from_utf16_lossy ( v) + "\u{FFFD} " ,
857
857
_ => {
858
858
let mut iter = v. array_chunks :: < 2 > ( ) ;
859
- let string = decode_utf16 ( iter. by_ref ( ) . copied ( ) . map ( u16:: from_be_bytes) )
860
- . map ( |r| r. unwrap_or ( REPLACEMENT_CHARACTER ) )
859
+ let string = char :: decode_utf16 ( iter. by_ref ( ) . copied ( ) . map ( u16:: from_be_bytes) )
860
+ . map ( |r| r. unwrap_or ( char :: REPLACEMENT_CHARACTER ) )
861
861
. collect ( ) ;
862
862
if iter. remainder ( ) . is_empty ( ) { string } else { string + "\u{FFFD} " }
863
863
}
0 commit comments