1406811 - stylo: Mismatches arguments for ServoSelectorList

Status: RESOLVED FIXED

(Core :: CSS Parsing and Computation, defect, P4)

Description

[Hiroyuki Ikezoe (:hiro)]

It causes errors on mach test-stylo when updating bindings like this.


error[E0308]: mismatched types
  --> /home/ikezoe/servo/target/geckolib/debug/build/stylo_tests-e6140111dc9425ff/out/check_bindings.rs:35:32
   |
35 |     [ Servo_SelectorList_Drop, bindings::Servo_SelectorList_Drop ];
   |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected *-ptr, found struct `style::gecko_bindings::sugar::ownership::Owned`
   |
   = note: expected type `unsafe extern "C" fn(*mut selectors::SelectorList<style::selector_parser::SelectorImpl>) {servo_function_signatures::glue::Servo_SelectorList_Drop}`
              found type `unsafe extern "C" fn(style::gecko_bindings::sugar::ownership::Owned<style::gecko_bindings::structs::RawServoSelectorList>) {style::gecko_bindings::bindings::Servo_SelectorList_Drop}`

error[E0308]: mismatched types
  --> /home/ikezoe/servo/target/geckolib/debug/build/stylo_tests-e6140111dc9425ff/out/check_bindings.rs:69:33
   |
69 |     [ Servo_SelectorList_Parse, bindings::Servo_SelectorList_Parse ];
   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `selectors::SelectorList`, found struct `style::gecko_bindings::structs::RawServoSelectorList`
   |
   = note: expected type `unsafe extern "C" fn(*const style::<unnamed>::nsACString) -> *mut selectors::SelectorList<style::selector_parser::SelectorImpl> {servo_function_signatures::glue::Servo_SelectorList_Parse}`
              found type `unsafe extern "C" fn(*const style::<unnamed>::nsACString) -> *mut style::gecko_bindings::structs::RawServoSelectorList {style::gecko_bindings::bindings::Servo_SelectorList_Parse}`

error[E0308]: mismatched types
  --> /home/ikezoe/servo/target/geckolib/debug/build/stylo_tests-e6140111dc9425ff/out/check_bindings.rs:70:35
   |
70 |     [ Servo_SelectorList_Matches, bindings::Servo_SelectorList_Matches ];
   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `selectors::SelectorList`, found struct `style::gecko_bindings::structs::RawServoSelectorList`
   |
   = note: expected type `unsafe extern "C" fn(&style::gecko_bindings::structs::Element, &selectors::SelectorList<style::selector_parser::SelectorImpl>) -> bool {servo_function_signatures::glue::Servo_SelectorList_Matches}`
              found type `unsafe extern "C" fn(&style::gecko_bindings::structs::Element, &style::gecko_bindings::structs::RawServoSelectorList) -> bool {style::gecko_bindings::bindings::Servo_SelectorList_Matches}`

https://treeherder.mozilla.org/#/jobs?repo=try&revision=2da3876846051a57277575fd8bc6205470f83f3c

Comment 1

[Hiroyuki Ikezoe (:hiro)]

Attachment: Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

Review commit: https://reviewboard.mozilla.org/r/187590/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/187590/

Comment 2

[Emilio Cobos Álvarez (:emilio)]

Comment on attachment 8916468 [details]
Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

https://reviewboard.mozilla.org/r/187590/#review192624

r=me, thanks!

Comment 3

[Hiroyuki Ikezoe (:hiro)]

Do'h.  This patch does not solve the failures on test-stylo.  The declarations should exactly match?

Comment 4

[Hiroyuki Ikezoe (:hiro)]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=27e636d09399960cca44d03cd93d5cf36de6db90

Comment 5

[Hiroyuki Ikezoe (:hiro)]

Attachment: Bug 1406811 - Remove a duplicate entry for RawServoSelectorListBorrowed.

Review commit: https://reviewboard.mozilla.org/r/187838/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/187838/

Comment 6

[Hiroyuki Ikezoe (:hiro)]

Comment on attachment 8916468 [details]
Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/187590/diff/1-2/

Comment 7

[Hiroyuki Ikezoe (:hiro)]

Comment on attachment 8916468 [details]
Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

Emilio, would you mind re-reviewing this?  I had to add HasBoxFFI and relevant traits for SelectorList to match the arguments.

Comment 8

[Emilio Cobos Álvarez (:emilio)]

Comment on attachment 8916777 [details]
Bug 1406811 - Remove a duplicate entry for RawServoSelectorListBorrowed.

https://reviewboard.mozilla.org/r/187838/#review192902

Comment 9

[Emilio Cobos Álvarez (:emilio)]

Comment on attachment 8916468 [details]
Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

r=me on this one too, if this makes the tests green, but I really rather rethink all this boilerplate.

This is a lot of code, and looks like a regression in readability from the original one IMO, with no clear safety benefit, wdyt?

Comment 10

[Hiroyuki Ikezoe (:hiro)]

Yeah, I'd actually prefer the original one if it can not be safer.

Comment 11

[Hiroyuki Ikezoe (:hiro)]

Attachment: Servo PR

Comment 12

[Hiroyuki Ikezoe (:hiro)]

Comment on attachment 8916468 [details]
Bug 1406811 - Fix mismatched arguments for Servo_SelectorXXX.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/187590/diff/2-3/

Comment 13

[Hiroyuki Ikezoe (:hiro)]

Comment on attachment 8916777 [details]
Bug 1406811 - Remove a duplicate entry for RawServoSelectorListBorrowed.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/187838/diff/1-2/

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0a994a272856
Fix mismatched arguments for Servo_SelectorXXX. r=emilio
https://hg.mozilla.org/integration/autoland/rev/5ccff8bf69d6
Remove a duplicate entry for RawServoSelectorListBorrowed. r=emilio

Comment 15

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/0a994a272856
https://hg.mozilla.org/mozilla-central/rev/5ccff8bf69d6