Fix the build for NLL #21356

SimonSapin · Aug 7, 2018

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 · Aug 7, 2018

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 · Aug 7, 2018

Warning

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

emilio · Aug 7, 2018

emilio approved these changes Aug 7, 2018

View changes

Looks good :)

emilio · Aug 7, 2018

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 · Aug 7, 2018

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 · Aug 8, 2018

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 · Aug 8, 2018

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

@bors-servo try

bors-servo · Aug 8, 2018

⌛️ Trying commit e510dea with merge 347d90c...

bors-servo · Aug 8, 2018

💔 Test failed - linux-rel-wpt

SimonSapin · Aug 8, 2018

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

jdm · Aug 8, 2018

@bors-servo r+

bors-servo · Aug 8, 2018

📌 Commit ff77763 has been approved by jdm

jdm · Aug 8, 2018

@bors-servo retry

jdm · Aug 8, 2018

@bors-servo force r+

bors-servo · Aug 24, 2018

📌 Commit 5d40886 has been approved by jdm

bors-servo · Aug 24, 2018

⌛️ Testing commit 5d40886 with merge dcc8a6e...

bors-servo · Aug 24, 2018

💔 Test failed - linux-dev

SimonSapin · Aug 24, 2018

WPT manifest updated.

@bors-servo r=jdm

bors-servo · Aug 24, 2018

📌 Commit 1333b6e has been approved by jdm

servo-wpt-sync · Aug 24, 2018

Transplanted upstreamable changes to existing PR.

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

bors-servo · Aug 24, 2018

⌛️ Testing commit 1333b6e with merge 3955119...

bors-servo · Aug 24, 2018

☀️ 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 · Aug 24, 2018

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

highfive assigned paulrouget Aug 7, 2018

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

jdm referenced this pull request Aug 8, 2018
Closed
Intermittent pass in /cors/redirect-userinfo.htm #21358

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 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 referenced this pull request Aug 24, 2018
Merged
Rustfmt layout crate #21509

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
*Sigh* rust-lang-nursery/getopts#53 (comment) Upstreamed from servo/servo#21356 [ci skip]

91f298a

servo-wpt-sync referenced this pull request Aug 24, 2018
Merged
Update getopts #12681

SimonSapin referenced this pull request Aug 26, 2018
Merged
Optional argument #53

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

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

d9af396

servo/servo

Join GitHub today

Fix the build for NLL #21356

Conversation

SimonSapin commented Aug 7, 2018 • edited

highfive assigned paulrouget Aug 7, 2018

This comment has been minimized.

highfive commented Aug 7, 2018

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

This comment has been minimized.

highfive commented Aug 7, 2018

emilio approved these changes Aug 7, 2018 View changes

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.

jdm referenced this pull request Aug 8, 2018

This comment has been minimized.

SimonSapin commented Aug 8, 2018

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

This comment has been minimized.

SimonSapin commented Aug 8, 2018

bors-servo added a commit that referenced this pull request Aug 8, 2018

This comment has been minimized.

bors-servo commented Aug 8, 2018

This comment has been minimized.

bors-servo commented 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

This comment has been minimized.

SimonSapin commented Aug 8, 2018

highfive assigned emilio and unassigned paulrouget Aug 8, 2018

This comment has been minimized.

jdm commented Aug 8, 2018

This comment has been minimized.

bors-servo commented 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

This comment has been minimized.

jdm commented Aug 8, 2018

jdm closed this Aug 8, 2018

jdm reopened this Aug 8, 2018

This comment has been minimized.

jdm commented Aug 8, 2018

This comment has been minimized.

bors-servo commented Aug 24, 2018

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

This comment has been minimized.

bors-servo commented Aug 24, 2018

bors-servo added a commit that referenced this pull request Aug 24, 2018

This comment has been minimized.

bors-servo commented Aug 24, 2018

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

SimonSapin added some commits Aug 7, 2018

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

This comment has been minimized.

SimonSapin commented Aug 24, 2018

This comment has been minimized.

bors-servo commented Aug 24, 2018

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

This comment has been minimized.

servo-wpt-sync commented Aug 24, 2018

bors-servo added a commit that referenced this pull request Aug 24, 2018

This comment has been minimized.

bors-servo commented Aug 24, 2018

This comment has been minimized.

bors-servo commented Aug 24, 2018

bors-servo referenced this pull request Aug 24, 2018

Hide details View details bors-servo merged commit 1333b6e into master Aug 24, 2018 3 of 4 checks passed

3 of 4 checks passed

This comment has been minimized.

servo-wpt-sync commented Aug 24, 2018

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

SimonSapin deleted the nll branch Aug 24, 2018

SimonSapin commented Aug 7, 2018 •

edited

emilio approved these changes Aug 7, 2018

View changes

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

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

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

bors-servo merged commit `1333b6e` into master Aug 24, 2018
3 of 4 checks passed