liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wstr: return correct result for `split_ascii_prefix_bytes(<ascii str>)` 

`split_ascii_prefix_bytes(b"abc")` should return `("abc", b"")`, not
`("", b"abc")`

This doesn't affect correctness, but should increase performance of
ASCII `String` -> `WString` conversions.
This commit is contained in:
Moulins 2023-08-02 23:42:39 +02:00 committed by Adrian Wielgosik
parent ad5f087baa
commit ff01444e63
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wstr/src/tests.rs
View File

@ -207,3 +207,10 @@ fn str_patterns() {
test_pattern(wide, bstr!(b"aa"), &[(2, 4), (6, 8)], None); test_pattern(wide, bstr!(b"aa"), &[(2, 4), (6, 8)], None);
test_pattern(wide, wstr!('↓''a'), &[(1, 3), (5, 7)], None); test_pattern(wide, wstr!('↓''a'), &[(1, 3), (5, 7)], None);
} }
#[test]
fn split_ascii_prefix() {
assert_eq!(utils::split_ascii_prefix(""), (&b""[..], ""));
assert_eq!(utils::split_ascii_prefix("abc"), (&b"abc"[..], ""));
assert_eq!(utils::split_ascii_prefix("abcd€fg"), (&b"abcd"[..], "€fg"));
}

2
wstr/src/utils.rs
View File

@ -53,7 +53,7 @@ pub fn swf_is_whitespace(c: u16) -> bool {
/// and returns it as an UTF8 string, together with the remaining tail. /// and returns it as an UTF8 string, together with the remaining tail.
pub fn split_ascii_prefix_bytes(slice: &[u8]) -> (&str, &[u8]) { pub fn split_ascii_prefix_bytes(slice: &[u8]) -> (&str, &[u8]) {
let first_non_ascii = slice.iter().position(|c| *c >= 0x80); let first_non_ascii = slice.iter().position(|c| *c >= 0x80);
let (head, tail) = slice.split_at(first_non_ascii.unwrap_or(0)); let (head, tail) = slice.split_at(first_non_ascii.unwrap_or(slice.len()));
// SAFETY: `head` only contains ASCII. // SAFETY: `head` only contains ASCII.
let head = unsafe { core::str::from_utf8_unchecked(head) }; let head = unsafe { core::str::from_utf8_unchecked(head) };
(head, tail) (head, tail)