Skip to content

Commit a7d57c6

Browse files
committed
Don't eagerly scan for is_known_utf8 in to_ascii_lowercase/uppercase.
1 parent d3a585e commit a7d57c6

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

library/std/src/sys_common/wtf8.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -762,18 +762,12 @@ impl Wtf8 {
762762

763763
#[inline]
764764
pub fn to_ascii_lowercase(&self) -> Wtf8Buf {
765-
Wtf8Buf {
766-
bytes: self.bytes.to_ascii_lowercase(),
767-
is_known_utf8: self.next_surrogate(0).is_none(),
768-
}
765+
Wtf8Buf { bytes: self.bytes.to_ascii_lowercase(), is_known_utf8: false }
769766
}
770767

771768
#[inline]
772769
pub fn to_ascii_uppercase(&self) -> Wtf8Buf {
773-
Wtf8Buf {
774-
bytes: self.bytes.to_ascii_uppercase(),
775-
is_known_utf8: self.next_surrogate(0).is_none(),
776-
}
770+
Wtf8Buf { bytes: self.bytes.to_ascii_uppercase(), is_known_utf8: false }
777771
}
778772

779773
#[inline]

library/std/src/sys_common/wtf8/tests.rs

-4
Original file line numberDiff line numberDiff line change
@@ -635,12 +635,10 @@ fn wtf8_make_ascii_lowercase() {
635635
let mut lowercase = Wtf8Buf::from_str("");
636636
lowercase.make_ascii_lowercase();
637637
assert_eq!(lowercase.bytes, b"");
638-
assert!(lowercase.is_known_utf8);
639638

640639
let mut lowercase = Wtf8Buf::from_str("GrEeN gRaPeS! 🍇");
641640
lowercase.make_ascii_lowercase();
642641
assert_eq!(lowercase.bytes, b"green grapes! \xf0\x9f\x8d\x87");
643-
assert!(lowercase.is_known_utf8);
644642

645643
let mut lowercase = unsafe { Wtf8::from_bytes_unchecked(b"\xED\xA0\x80").to_owned() };
646644
lowercase.make_ascii_lowercase();
@@ -653,12 +651,10 @@ fn wtf8_make_ascii_uppercase() {
653651
let mut uppercase = Wtf8Buf::from_str("");
654652
uppercase.make_ascii_uppercase();
655653
assert_eq!(uppercase.bytes, b"");
656-
assert!(uppercase.is_known_utf8);
657654

658655
let mut uppercase = Wtf8Buf::from_str("GrEeN gRaPeS! 🍇");
659656
uppercase.make_ascii_uppercase();
660657
assert_eq!(uppercase.bytes, b"GREEN GRAPES! \xf0\x9f\x8d\x87");
661-
assert!(uppercase.is_known_utf8);
662658

663659
let mut uppercase = unsafe { Wtf8::from_bytes_unchecked(b"\xED\xA0\x80").to_owned() };
664660
uppercase.make_ascii_uppercase();

0 commit comments

Comments
 (0)