Skip to content

Commit 4a8b04e

Browse files
committed
utf8 validation: Cleanup code in the ascii fast path
1 parent 20bd7f0 commit 4a8b04e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/libcore/str/mod.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1292,13 +1292,11 @@ fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {
12921292
if align == 0 {
12931293
while offset < blocks_end {
12941294
unsafe {
1295-
let u = *(ptr.offset(offset as isize) as *const usize);
1296-
let v = *(ptr.offset((offset + usize_bytes) as isize) as *const usize);
1297-
1295+
let block = ptr.offset(offset as isize) as *const usize;
12981296
// break if there is a nonascii byte
1299-
let zu = contains_nonascii(u);
1300-
let zv = contains_nonascii(v);
1301-
if zu || zv {
1297+
let zu = contains_nonascii(*block);
1298+
let zv = contains_nonascii(*block.offset(1));
1299+
if zu | zv {
13021300
break;
13031301
}
13041302
}

0 commit comments

Comments
 (0)