user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

utf8 validation: Cleanup code in the ascii fast path

Browse source
This commit is contained in:
Ulrik Sverdrup 2016-11-22 13:47:45 +01:00
parent 20bd7f000f
commit 4a8b04eda0
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcore/str/mod.rs
View file

@ -1292,13 +1292,11 @@ fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {
if align == 0 {
while offset < blocks_end {
unsafe {
let u = *(ptr.offset(offset as isize) as *const usize);
let v = *(ptr.offset((offset + usize_bytes) as isize) as *const usize);
let block = ptr.offset(offset as isize) as *const usize;
// break if there is a nonascii byte
let zu = contains_nonascii(u);
let zv = contains_nonascii(v);
if zu || zv {
let zu = contains_nonascii(*block);
let zv = contains_nonascii(*block.offset(1));
if zu | zv {
break;
}
}