yume/yume-post-smtp-proto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from lukaslihotzki/to-digit

Browse source 
refactor: use to_digit instead of custom HEX_MAP
This commit is contained in:
Mauro D 2023-04-03 18:25:19 +02:00 committed by GitHub
commit 72fd0e2da0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/request/mod.rs
View file

@ -135,23 +135,3 @@ define_tokens_128! {
XOAUTH, XOAUTH,
XOAUTH2, XOAUTH2,
} }
/*
* Adapted from Daniel Lemire's source:
* https://github.com/lemire/Code-used-on-Daniel-Lemire-s-blog/blob/master/2019/04/17/hexparse.cpp
*
*/
pub(crate) static HEX_MAP: &[i8] = &[
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10,
11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
];

14
src/request/parser.rs
View file

@ -583,19 +583,15 @@ impl<'x, 'y> Rfc5321Parser<'x, 'y> {
return Ok(value.into_string()); return Ok(value.into_string());
} }
b'+' => { b'+' => {
let mut hex1 = 0; let mut hex1 = None;
while let Some(&ch) = self.bytes.next() { while let Some(&ch) = self.bytes.next() {
if ch.is_ascii_hexdigit() { if let Some(digit) = char::from(ch).to_digit(16) {
if hex1 != 0 { if let Some(hex1) = hex1 {
let hex1 = HEX_MAP[hex1 as usize]; value.push(((hex1 as u8) << 4) | digit as u8);
let hex2 = HEX_MAP[ch as usize];
if hex1 != -1 && hex2 != -1 {
value.push(((hex1 as u8) << 4) | hex2 as u8);
}
break; break;
} else { } else {
hex1 = ch; hex1 = Some(digit);
} }
} else if ch == LF { } else if ch == LF {
self.stop_char = b'\n'; self.stop_char = b'\n';