style: Deindent a bit SVG path parsing code.

None cannot be returned, since we just called peek() and it returned something.

Differential Revision: https://phabricator.services.mozilla.com/D40538
This commit is contained in:
Emilio Cobos Álvarez 2019-08-03 10:01:58 +00:00
parent 3ec38e252f
commit 2c17050819
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A

View file

@ -625,40 +625,36 @@ impl<'a> PathParser<'a> {
break; break;
} }
match self.chars.next() { let command = self.chars.next().unwrap();
Some(command) => { let abs = if command.is_ascii_uppercase() {
let abs = if command.is_ascii_uppercase() { IsAbsolute::Yes
IsAbsolute::Yes } else {
} else { IsAbsolute::No
IsAbsolute::No };
}; macro_rules! parse_command {
macro_rules! parse_command { ( $($($p:pat)|+ => $parse_func:ident,)* ) => {
( $($($p:pat)|+ => $parse_func:ident,)* ) => { match command {
match command { $(
$( $($p)|+ => {
$($p)|+ => { skip_wsp(&mut self.chars);
skip_wsp(&mut self.chars); self.$parse_func(abs)?;
self.$parse_func(abs)?; },
}, )*
)* _ => return Err(()),
_ => return Err(()),
}
}
} }
parse_command!( }
b'Z' | b'z' => parse_closepath,
b'L' | b'l' => parse_lineto,
b'H' | b'h' => parse_h_lineto,
b'V' | b'v' => parse_v_lineto,
b'C' | b'c' => parse_curveto,
b'S' | b's' => parse_smooth_curveto,
b'Q' | b'q' => parse_quadratic_bezier_curveto,
b'T' | b't' => parse_smooth_quadratic_bezier_curveto,
b'A' | b'a' => parse_elliptical_arc,
);
},
_ => break, // no more commands.
} }
parse_command!(
b'Z' | b'z' => parse_closepath,
b'L' | b'l' => parse_lineto,
b'H' | b'h' => parse_h_lineto,
b'V' | b'v' => parse_v_lineto,
b'C' | b'c' => parse_curveto,
b'S' | b's' => parse_smooth_curveto,
b'Q' | b'q' => parse_quadratic_bezier_curveto,
b'T' | b't' => parse_smooth_quadratic_bezier_curveto,
b'A' | b'a' => parse_elliptical_arc,
);
} }
Ok(()) Ok(())
} }