Prepare stylo crates for switching to the 2018 edition #22083

SimonSapin · 2018-11-01T21:18:43Z

This can land when Gecko requires Rust 1.30. This does not switch the crates yet because the new edition is not yet stable in 1.30.

This change is

SimonSapin · 2018-11-01T21:18:53Z

CC @emilio

bors-servo · 2018-11-05T14:00:12Z

☔ The latest upstream changes (presumably #22111) made this pull request unmergeable. Please resolve the merge conflicts.

SimonSapin · 2018-11-05T14:19:05Z

This is blocked on https://bugzilla.mozilla.org/show_bug.cgi?id=1504031


        Auto merge of #22086 - servo:2018-without-stylo, r=<try>

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)


        Auto merge of #22086 - servo:2018-without-stylo, r=

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)

bors-servo · 2018-11-05T22:34:09Z

☔ The latest upstream changes (presumably #22099) made this pull request unmergeable. Please resolve the merge conflicts.


        Auto merge of #22086 - servo:2018-without-stylo, r=<try>

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)


        Auto merge of #22086 - servo:2018-without-stylo, r=<try>

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)


        Auto merge of #22086 - servo:2018-without-stylo, r=<try>

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)


        Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin

Switch some crates to the 2018 edition This is the subset of #22083 that doesn’t affect Gecko at all, so it isn’t blocked.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)

bors-servo · 2018-11-07T15:14:53Z

☔ The latest upstream changes (presumably #22126) made this pull request unmergeable. Please resolve the merge conflicts.

bors-servo · 2018-11-08T23:37:45Z

☔ The latest upstream changes (presumably #22143) made this pull request unmergeable. Please resolve the merge conflicts.

SimonSapin · 2018-11-09T10:04:03Z

I’ve verified that (cd components/style && cargo check --features gecko) works, after copying ../gecko/obj-x86_64-pc-linux-gnu/x86_64-unknown-linux-gnu/debug/build/style-*/out/gecko/* to components/style/gecko/generated/ and applying this diff:

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 15e4175160..8e9cbaaf30 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -73,6 +73,7 @@ uluru = "0.3"
 unicode-bidi = "0.3"
 unicode-segmentation = "1.0"
 void = "1.0.2"
+nsstring = {path = "../../../gecko/servo/support/gecko/nsstring"}
 
 [build-dependencies]
 lazy_static = "1"
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 072b78cf37..3cd111b8ad 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -427,7 +427,7 @@ pub const NON_CUSTOM_PROPERTY_ID_COUNT: usize =
 #[allow(dead_code)]
 unsafe fn static_assert_nscsspropertyid() {
     % for i, property in enumerate(data.longhands + data.shorthands + data.all_aliases()):
-    std::mem::transmute::<[u8; ${i}], [u8; ${property.nscsspropertyid()} as usize]>([0; ${i}]); // ${property.name}
+//    std::mem::transmute::<[u8; ${i}], [u8; ${property.nscsspropertyid()} as usize]>([0; ${i}]); // ${property.name}
     % endfor
 }
 % endif

emilio · 2018-11-09T13:36:52Z

Huh, why does static_assert_nscsspropertyid no longer hold?

SimonSapin · 2018-11-09T14:08:50Z

Honestly I’m not sure. Some other errors were files when I rebuilt gecko with the commit that had the same message as your last sync commit in servo, but these persisted. Could there be a difference between using --feature use_bindgen v.s. not?

There are 44 errors: https://gist.github.com/rust-play/fa2dcae2579e5daa6cd77a9f057836e4

The differences between expected and actual IDs are all either -8, -6, 4, 8, or 10: https://gist.github.com/rust-play/352434b01b59d3e34f610ddadace3f35, so it looks like the sorting is not the same.

SimonSapin · 2018-11-10T16:15:37Z

@bors-servo r=emilio

bors-servo · 2018-11-10T16:15:38Z

📌 Commit c5d7294 has been approved by emilio

SimonSapin · 2018-11-10T16:40:25Z

Added a commit to fix unrelated infra issue that was uncovered now because of a cache expiration.

@bors-servo r=emilio

bors-servo · 2018-11-10T16:40:26Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: #22165

bors-servo · 2018-11-10T16:40:26Z

📌 Commit c5d7294 has been approved by emilio

bors-servo · 2018-11-10T16:40:32Z

⌛ Testing commit c5d7294 with merge 7714615...


        Auto merge of #22083 - servo:2018, r=emilio

Prepare stylo crates for switching to the 2018 edition This can land when [Gecko requires Rust 1.30](https://bugzilla.mozilla.org/show_bug.cgi?id=1504031). This does not switch the crates yet because the new edition is not yet stable in 1.30.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22083)

SimonSapin · 2018-11-10T16:40:52Z

@bors-servo r-


        Use 2018-style paths in code generated by style_derive


        Use 2018-style paths in code generated by Mako


        `cargo fix --edition`


        `cargo fix --edition --features gecko`


        Always build Docker images on AWS

SimonSapin · 2018-11-10T16:48:06Z

@bors-servo r=emilio

bors-servo · 2018-11-10T16:48:06Z

📌 Commit b0d13cc has been approved by emilio

bors-servo · 2018-11-10T16:48:11Z

⌛ Testing commit b0d13cc with merge 3b1078b...


        Auto merge of #22083 - servo:2018, r=emilio

Prepare stylo crates for switching to the 2018 edition This can land when [Gecko requires Rust 1.30](https://bugzilla.mozilla.org/show_bug.cgi?id=1504031). This does not switch the crates yet because the new edition is not yet stable in 1.30.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22083)

bors-servo · 2018-11-10T18:23:01Z

☀️ Test successful - android, android-mac, 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, status-taskcluster, windows-msvc-dev
Approved by: emilio
Pushing 3b1078b to master...

SimonSapin force-pushed the 2018 branch from 3431b1c to 7be6094 Nov 1, 2018

highfive added the S-awaiting-review label Nov 1, 2018

SimonSapin mentioned this pull request Nov 1, 2018

Switch some crates to the 2018 edition #22086

Merged

highfive added the S-needs-rebase label Nov 5, 2018

SimonSapin force-pushed the 2018 branch from 7be6094 to ca806e7 Nov 5, 2018

SimonSapin force-pushed the 2018 branch from ca806e7 to 61e1f39 Nov 6, 2018

SimonSapin changed the title ~~[Do not merge] Switch most crates to the 2018 edition~~ [Do not merge] Prepare stylo crates for switching to the 2018 edition Nov 6, 2018

SimonSapin force-pushed the 2018 branch 2 times, most recently from 5f88a81 to fa45fc3 Nov 7, 2018

SimonSapin force-pushed the 2018 branch from fa45fc3 to c5d7294 Nov 9, 2018

SimonSapin changed the title ~~[Do not merge] Prepare stylo crates for switching to the 2018 edition~~ Prepare stylo crates for switching to the 2018 edition Nov 9, 2018

highfive assigned emilio Nov 10, 2018

highfive removed the S-awaiting-review label Nov 10, 2018

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 10, 2018

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 10, 2018

SimonSapin force-pushed the 2018 branch from c5d7294 to 67d35ed Nov 10, 2018

highfive added S-awaiting-review and removed S-awaiting-merge labels Nov 10, 2018

SimonSapin added 5 commits Nov 1, 2018

Use 2018-style paths in code generated by style_derive

ede79a6

Use 2018-style paths in code generated by Mako

e1fcffb

`cargo fix --edition`

a15d33a

`cargo fix --edition --features gecko`

b1822a3

Always build Docker images on AWS

Loading status checks…

b0d13cc

SimonSapin force-pushed the 2018 branch from 67d35ed to b0d13cc Nov 10, 2018

highfive added S-awaiting-merge and removed S-awaiting-review labels Nov 10, 2018

bors-servo merged commit b0d13cc into master Nov 10, 2018
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Nov 10, 2018

bors-servo mentioned this pull request Nov 10, 2018

Update crossbeam-channel to 0.3 #22142

Merged

SimonSapin deleted the 2018 branch Nov 10, 2018

servo / servo

Prepare stylo crates for switching to the 2018 edition #22083

Prepare stylo crates for switching to the 2018 edition #22083

SimonSapin commented Nov 1, 2018 •

edited

SimonSapin commented Nov 1, 2018

bors-servo commented Nov 5, 2018

SimonSapin commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 8, 2018

SimonSapin commented Nov 9, 2018

emilio commented Nov 9, 2018

SimonSapin commented Nov 9, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

servo / servo

Join GitHub today

Prepare stylo crates for switching to the 2018 edition #22083

Prepare stylo crates for switching to the 2018 edition #22083

Conversation

SimonSapin commented Nov 1, 2018 • edited

SimonSapin commented Nov 1, 2018

bors-servo commented Nov 5, 2018

SimonSapin commented Nov 5, 2018

bors-servo commented Nov 5, 2018

bors-servo commented Nov 7, 2018

bors-servo commented Nov 8, 2018

SimonSapin commented Nov 9, 2018

emilio commented Nov 9, 2018

SimonSapin commented Nov 9, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

SimonSapin commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

bors-servo commented Nov 10, 2018

SimonSapin commented Nov 1, 2018 •

edited