1386887 - stylo: Address FFI lifetime breakage in rustc nightly

Status: RESOLVED FIXED

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

Description

[Manish Goregaokar [:manishearth]]

We fail on nightly with https://github.com/rust-lang/rust/issues/43567

This will be fixed. However, with the fix we shall get some concrete lifetime errors (apparently elision wasn't happening correctly on FFI anyway).

I'm going to preemptively fix these so that when the time comes we can effortlessly upgrade.

Comment 1

[Manish Goregaokar [:manishearth]]

Attachment: Bug 1386887 - Clean up FFI lifetimes to work on nightly;

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

Comment 2

[Emilio Cobos Álvarez (:emilio)]

Comment on attachment 8893142 [details]
Bug 1386887 - Clean up FFI lifetimes to work on nightly;

https://reviewboard.mozilla.org/r/164142/#review169636

::: gfx/webrender/src/render_task.rs:186
(Diff revision 1)
>      pub fn new_mask(task_rect: DeviceIntRect,
>                      mask_key: MaskCacheKey,
>                      raw_clips: &[ClipWorkItem],
>                      extra_clip: Option<ClipWorkItem>)
>                      -> Option<RenderTask> {
> -        /// Filter out all the clip instances that don't contribute to the result
> +        // Filter out all the clip instances that don't contribute to the result

This should belong to a different commit.

::: layout/style/ServoBindings.toml:357
(Diff revision 1)
>      "type nsACString_internal = nsACString;",
>      "type nsAString_internal = nsAString;",
>      "pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;",
>      "pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;",
>      "pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;",
> +    "pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();"

(I really don't love this setup fwiw)

Comment 3

[Manish Goregaokar [:manishearth]]

> (I really don't love this setup fwiw)


I want a replace_type toml section, may add one later.

Comment 4

[Manish Goregaokar [:manishearth]]

Attachment: Bug 1386887 - Remove doc comment from statement;

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

Comment 5

[Manish Goregaokar [:manishearth]]

Comment on attachment 8893142 [details]
Bug 1386887 - Clean up FFI lifetimes to work on nightly;

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

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d82b3d0ec21a
Clean up FFI lifetimes to work on nightly; r=emilio

Comment 7

[Emilio Cobos Álvarez (:emilio)]

Comment on attachment 8893549 [details]
Bug 1386887 - Remove doc comment from statement;

https://reviewboard.mozilla.org/r/164624/#review170272

I think this is a WR change and should be upstreamed, but however you land this, r=me

Comment 8

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

https://hg.mozilla.org/mozilla-central/rev/d82b3d0ec21a

Comment 9

[Aki Sasaki (not active)]

https://hg.mozilla.org/projects/date/rev/d82b3d0ec21a2b4ce4be10c1ce8b2f88b9129ca9
Bug 1386887 - Clean up FFI lifetimes to work on nightly; r=emilio