mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-10-31 08:18:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1912663 - Fix some build issues with cbindgen 0.27. r=firefox-style-system-reviewers,zrhoffman, a=dmeehan

Browse source 
It updates serde and syn and they are more strict. In particular, syn 2
doesn't parse the rust 2015 syntax where try is not a keyword, and serde
rejects duplicate keys.

Differential Revision: https://phabricator.services.mozilla.com/D219025
This commit is contained in:
Emilio Cobos Álvarez 2024-08-11 15:12:29 +00:00
parent 9192afb540
commit f2e5c20b74
2 changed files with 8 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
servo/components/style_traits/values.rs
View file

@ -388,11 +388,11 @@ impl Separator for Space {
where where
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, 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)?]; let mut results = vec![parse_one(input)?];
loop { 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.
if let Ok(item) = input.try(&mut parse_one) { if let Ok(item) = input.try_parse(&mut parse_one) {
results.push(item); results.push(item);
} else { } else {
return Ok(results); return Ok(results);
@ -413,14 +413,14 @@ impl Separator for CommaWithSpace {
where where
F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, 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)?]; let mut results = vec![parse_one(input)?];
loop { 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_location = input.current_source_location();
let comma = input.try(|i| i.expect_comma()).is_ok(); let comma = input.try_parse(|i| i.expect_comma()).is_ok();
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.
if let Ok(item) = input.try(&mut parse_one) { if let Ok(item) = input.try_parse(&mut parse_one) {
results.push(item); results.push(item);
} else if comma { } else if comma {
return Err(comma_location.new_unexpected_token_error(Token::Comma)); return Err(comma_location.new_unexpected_token_error(Token::Comma));

1
servo/ports/geckolib/cbindgen.toml
View file

@ -352,7 +352,6 @@ renaming_overrides_prefixing = true
"Keyframe" = "Keyframe" "Keyframe" = "Keyframe"
"nsChangeHint" = "nsChangeHint" "nsChangeHint" = "nsChangeHint"
"ServoElementSnapshotTable" = "ServoElementSnapshotTable" "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
"Keyframe" = "Keyframe"
"ComputedKeyframeValues" = "ComputedKeyframeValues" "ComputedKeyframeValues" = "ComputedKeyframeValues"
"OriginFlags" = "OriginFlags" "OriginFlags" = "OriginFlags"
"ServoTraversalFlags" = "ServoTraversalFlags" "ServoTraversalFlags" = "ServoTraversalFlags"