shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unwraps from escape parsing

Browse Source 
these could not cause panics, but it is nice to reduce the number of
unwraps either way
This commit is contained in:
Connor Skees 2020-08-19 14:26:07 -04:00
parent 6849cd578f
commit f2d1a82f34
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/parse/ident.rs
View File

@ -95,16 +95,18 @@ impl<'a> Parser<'a> {
break; break;
} }
value *= 16; value *= 16;
span = span.merge(next.pos()); span = span.merge(next.pos);
value += as_hex(self.toks.next().unwrap().kind) value += as_hex(next.kind);
self.toks.next();
} }
if self.toks.peek().is_some() && self.toks.peek().unwrap().kind.is_whitespace() { if matches!(self.toks.peek(), Some(Token { kind: ' ', .. }) | Some(Token { kind: '\n', .. }) | Some(Token { kind: '\t', .. }))
{
self.toks.next(); self.toks.next();
} }
} else { } else {
let next = self.toks.next().unwrap(); span = span.merge(first.pos);
span = span.merge(next.pos()); value = first.kind as u32;
value = next.kind as u32; self.toks.next();
} }
let c = std::char::from_u32(value).ok_or(("Invalid escape sequence.", span))?; let c = std::char::from_u32(value).ok_or(("Invalid escape sequence.", span))?;

3
src/parse/value/css_function.rs
View File

@ -372,7 +372,8 @@ impl<'a> Parser<'a> {
span = span.merge(next.pos); span = span.merge(next.pos);
self.toks.peek_forward(1); self.toks.peek_forward(1);
} }
if self.toks.peek().is_some() && self.toks.peek().unwrap().kind.is_whitespace() { if matches!(self.toks.peek(), Some(Token { kind: ' ', .. }) | Some(Token { kind: '\n', .. }) | Some(Token { kind: '\t', .. }))
{
self.toks.peek_forward(1); self.toks.peek_forward(1);
} }
} else { } else {