mirror of
https://aur.archlinux.org/firedragon.git
synced 2024-12-26 04:34:15 +00:00
63 lines
3.1 KiB
Diff
63 lines
3.1 KiB
Diff
diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs
|
|
--- a/servo/components/style_traits/values.rs
|
|
+++ b/servo/components/style_traits/values.rs
|
|
@@ -387,15 +387,15 @@
|
|
mut parse_one: F,
|
|
) -> Result<Vec<T>, ParseError<'i, E>>
|
|
where
|
|
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
|
|
{
|
|
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
|
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
|
let mut results = vec![parse_one(input)?];
|
|
loop {
|
|
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
|
- if let Ok(item) = input.try(&mut parse_one) {
|
|
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
|
+ if let Ok(item) = input.try_parse(&mut parse_one) {
|
|
results.push(item);
|
|
} else {
|
|
return Ok(results);
|
|
}
|
|
}
|
|
@@ -412,18 +412,18 @@
|
|
mut parse_one: F,
|
|
) -> Result<Vec<T>, ParseError<'i, E>>
|
|
where
|
|
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
|
|
{
|
|
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
|
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
|
let mut results = vec![parse_one(input)?];
|
|
loop {
|
|
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
|
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
|
let comma_location = input.current_source_location();
|
|
- let comma = input.try(|i| i.expect_comma()).is_ok();
|
|
- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
|
|
- if let Ok(item) = input.try(&mut parse_one) {
|
|
+ let comma = input.try_parse(|i| i.expect_comma()).is_ok();
|
|
+ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
|
|
+ if let Ok(item) = input.try_parse(&mut parse_one) {
|
|
results.push(item);
|
|
} else if comma {
|
|
return Err(comma_location.new_unexpected_token_error(Token::Comma));
|
|
} else {
|
|
break;
|
|
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
|
|
--- a/servo/ports/geckolib/cbindgen.toml
|
|
+++ b/servo/ports/geckolib/cbindgen.toml
|
|
@@ -360,11 +360,10 @@
|
|
"gfxFontVariation" = "gfxFontVariation"
|
|
"URLExtraData" = "URLExtraData"
|
|
"Keyframe" = "Keyframe"
|
|
"nsChangeHint" = "nsChangeHint"
|
|
"ServoElementSnapshotTable" = "ServoElementSnapshotTable"
|
|
-"Keyframe" = "Keyframe"
|
|
"ComputedKeyframeValues" = "ComputedKeyframeValues"
|
|
"OriginFlags" = "OriginFlags"
|
|
"ServoTraversalFlags" = "ServoTraversalFlags"
|
|
"ServoStyleSetSizes" = "ServoStyleSetSizes"
|
|
"BeforeFlag" = "StyleEasingBeforeFlag"
|
|
|