Fix the build for NLL #21356

SimonSapin · 2018-08-07T22:10:26Z

Test with RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build

https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7

This change is

highfive · 2018-08-07T22:10:30Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/imagedata.rs, components/script/dom/window.rs
@KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/imagedata.rs, components/script/dom/window.rs
@emilio: components/layout/table.rs

highfive · 2018-08-07T22:10:32Z

Warning

These commits modify layout and script code, but no tests are modified. Please consider adding a test!

emilio

Looks good :)

emilio · 2018-08-07T22:24:08Z

components/layout/table.rs

                        self.column_computed_inline_sizes[index].size +=
-                            remaining_inline_size.scale_by(
-                                self.column_computed_inline_sizes[index].size.0 as f32 / total_minimum_size);


This looks a bit like a regression doesn't it?

This is possibly rust-lang/rust#47349, which I'm working on.

Per rust-lang/rust#47349 (comment) the new borrowck behavior is considered correct. That issue is only still open in order to improve the error message.

emilio · 2018-08-07T22:24:08Z

components/layout/table.rs

@@ -531,7 +531,7 @@ impl Flow for TableFlow {
        self.block_flow.build_display_list_for_block(state, border_painting_mode);

        let iter = TableCellStyleIterator::new(&self);
-        for mut style in iter {
+        for style in iter {


Just curious, are these just to avoid warnings?

Yes, I suppose that they were false negatives for the warning under AST-borrowck.

SimonSapin · 2018-08-08T05:52:24Z

Oops I accidentally pushed this to master :/ Thanks @jdm for taking care of reverting. Don’t we have github settings to prevent this from happening, though?

SimonSapin · 2018-08-08T05:56:27Z

Per #21358 it looks like unrelated changes in url fixed some tests, so this PR will need to update expectations.

@bors-servo try


        Auto merge of #21356 - servo:nll, r=<try>

Fix the build for NLL Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21356)

bors-servo · 2018-08-08T05:56:32Z

⌛ Trying commit e510dea with merge 347d90c...

bors-servo · 2018-08-08T06:18:03Z

💔 Test failed - linux-rel-wpt

SimonSapin · 2018-08-08T17:21:58Z

This should be landable now. r? @emilio (or anyone)

jdm · 2018-08-08T17:35:39Z

@bors-servo r+

bors-servo · 2018-08-08T17:35:40Z

📌 Commit ff77763 has been approved by jdm

jdm · 2018-08-08T18:17:37Z

@bors-servo retry

jdm · 2018-08-08T18:18:16Z

@bors-servo force r+

bors-servo · 2018-08-24T14:35:37Z

📌 Commit 5d40886 has been approved by jdm

bors-servo · 2018-08-24T15:03:27Z

⌛ Testing commit 5d40886 with merge dcc8a6e...


        Auto merge of #21356 - servo:nll, r=jdm

Fix the build for NLL Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21356)

bors-servo · 2018-08-24T15:21:50Z

💔 Test failed - linux-dev


        Update getopts

*Sigh* rust-lang/getopts#53 (comment)


        Fix the build for NLL

Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7

SimonSapin · 2018-08-24T15:50:36Z

WPT manifest updated.

@bors-servo r=jdm

bors-servo · 2018-08-24T15:50:37Z

📌 Commit 1333b6e has been approved by jdm

servo-wpt-sync · 2018-08-24T15:50:50Z

Transplanted upstreamable changes to existing PR.

Completed upstream sync of web-platform-test changes at jdm/web-platform-tests#78.


        Auto merge of #21356 - servo:nll, r=jdm

Fix the build for NLL Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21356)

bors-servo · 2018-08-24T16:13:13Z

⌛ Testing commit 1333b6e with merge 3955119...

bors-servo · 2018-08-24T17:10:06Z

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 3955119 to master...

servo-wpt-sync · 2018-08-24T17:10:24Z

Error syncing changes upstream. Logs saved in error-snapshot-1535130643349.


        Update getopts

*Sigh* rust-lang/getopts#53 (comment) Upstreamed from servo/servo#21356 [ci skip]


        Update getopts

*Sigh* rust-lang/getopts#53 (comment) Upstreamed from servo/servo#21356 [ci skip]

highfive assigned paulrouget Aug 7, 2018

highfive added the S-awaiting-review label Aug 7, 2018

emilio approved these changes Aug 7, 2018

View changes

jdm mentioned this pull request Aug 8, 2018

Intermittent pass in /cors/redirect-userinfo.htm #21358

Closed

SimonSapin closed this Aug 8, 2018

SimonSapin force-pushed the nll branch from 40a7cb7 to d1733aa Aug 8, 2018

SimonSapin reopened this Aug 8, 2018

highfive added the S-tests-failed label Aug 8, 2018

SimonSapin force-pushed the nll branch from e510dea to ff77763 Aug 8, 2018

highfive removed the S-tests-failed label Aug 8, 2018

highfive assigned emilio and unassigned paulrouget Aug 8, 2018

highfive assigned jdm and unassigned emilio Aug 8, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 8, 2018

jdm closed this Aug 8, 2018

jdm reopened this Aug 8, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 24, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Aug 24, 2018

SimonSapin added 2 commits Aug 24, 2018

Update getopts

a9627d2

*Sigh* rust-lang/getopts#53 (comment)

Fix the build for NLL

Loading status checks…

1333b6e

Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7

SimonSapin force-pushed the nll branch from 5d40886 to 1333b6e Aug 24, 2018

highfive added S-awaiting-review and removed S-tests-failed labels Aug 24, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 24, 2018

bors-servo mentioned this pull request Aug 24, 2018

Rustfmt layout crate #21509

Merged

highfive removed the S-awaiting-merge label Aug 24, 2018

SimonSapin deleted the nll branch Aug 24, 2018

jdm added a commit to web-platform-tests/wpt that referenced this pull request Aug 24, 2018

Update getopts

91f298a

*Sigh* rust-lang/getopts#53 (comment) Upstreamed from servo/servo#21356 [ci skip]

servo-wpt-sync mentioned this pull request Aug 24, 2018

Update getopts web-platform-tests/wpt#12681

Merged

SimonSapin mentioned this pull request Aug 26, 2018

Optional argument rust-lang/getopts#53

Merged

zcorpan added a commit to web-platform-tests/wpt that referenced this pull request Aug 27, 2018

Update getopts

d9af396

*Sigh* rust-lang/getopts#53 (comment) Upstreamed from servo/servo#21356 [ci skip]

servo / servo

Fix the build for NLL #21356

Fix the build for NLL #21356

SimonSapin commented Aug 7, 2018 •

edited

highfive commented Aug 7, 2018

highfive commented Aug 7, 2018

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Aug 8, 2018

SimonSapin commented Aug 8, 2018

bors-servo commented Aug 8, 2018

bors-servo commented Aug 8, 2018

SimonSapin commented Aug 8, 2018

jdm commented Aug 8, 2018

bors-servo commented Aug 8, 2018

jdm commented Aug 8, 2018

jdm commented Aug 8, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

SimonSapin commented Aug 24, 2018

bors-servo commented Aug 24, 2018

servo-wpt-sync commented Aug 24, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

servo-wpt-sync commented Aug 24, 2018

servo / servo

Join GitHub today

Fix the build for NLL #21356

Fix the build for NLL #21356

Conversation

SimonSapin commented Aug 7, 2018 • edited

highfive commented Aug 7, 2018

highfive commented Aug 7, 2018

emilio left a comment

This comment has been minimized.

emilio Aug 7, 2018

This comment has been minimized.

KiChjang Aug 8, 2018

This comment has been minimized.

SimonSapin Aug 8, 2018

This comment has been minimized.

emilio Aug 7, 2018

This comment has been minimized.

SimonSapin Aug 8, 2018

SimonSapin commented Aug 8, 2018

SimonSapin commented Aug 8, 2018

bors-servo commented Aug 8, 2018

bors-servo commented Aug 8, 2018

SimonSapin commented Aug 8, 2018

jdm commented Aug 8, 2018

bors-servo commented Aug 8, 2018

jdm commented Aug 8, 2018

jdm commented Aug 8, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

SimonSapin commented Aug 24, 2018

bors-servo commented Aug 24, 2018

servo-wpt-sync commented Aug 24, 2018

bors-servo commented Aug 24, 2018

bors-servo commented Aug 24, 2018

servo-wpt-sync commented Aug 24, 2018

SimonSapin commented Aug 7, 2018 •

edited