Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) #18046

SimonSapin · 2017-08-11T15:13:44Z

This change is

highfive · 2017-08-11T15:13:48Z

Heads up! This PR modifies the following files:

@bholley: components/style/stylesheets/rule_parser.rs, components/style/invalidation/element/invalidator.rs, components/style/stylesheets/rules_iterator.rs, components/style/properties/properties.mako.rs, components/style/matching.rs and 3 more
@jgraham: components/webdriver_server/lib.rs
@canaltinova: components/style/stylesheets/rule_parser.rs, components/style/invalidation/element/invalidator.rs, components/style/stylesheets/rules_iterator.rs, components/style/properties/properties.mako.rs, components/style/matching.rs and 3 more
@emilio: components/layout/display_list_builder.rs, components/style/stylesheets/rule_parser.rs, components/layout/text.rs, components/style/invalidation/element/invalidator.rs, components/style/stylesheets/rules_iterator.rs and 12 more
@fitzgen: components/script_plugins/unrooted_must_root.rs, components/script/dom/vrdisplay.rs, components/script/dom/range.rs, components/script/dom/bindings/js.rs, components/script/dom/document.rs and 10 more
@KiChjang: components/script_plugins/unrooted_must_root.rs, components/script/dom/vrdisplay.rs, components/script/dom/range.rs, components/script/dom/bindings/js.rs, components/script/dom/document.rs and 9 more
@asajeffrey: components/webdriver_server/lib.rs

emilio · 2017-08-11T15:42:22Z

@bors-servo r+

bors-servo · 2017-08-11T15:42:23Z

📌 Commit b4600ae has been approved by emilio

bors-servo · 2017-08-11T15:42:27Z

⌛ Testing commit b4600ae with merge 6ea7d10...


        Auto merge of #18046 - servo:rustup, r=emilio

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18046)

mbrubeck · 2017-08-11T15:49:31Z

components/script_plugins/unrooted_must_root.rs

@@ -206,7 +206,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
    fn visit_pat(&mut self, pat: &'tcx hir::Pat) {
        let cx = self.cx;

-        if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node {
+        if let hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, _, _, _) = pat.node {


This should also check BindingAnnotation::Mutable which is used for mut x bindings.

This is also susceptible to false positives once "default binding modes" is implemented (rust-lang/rust#42640); we should probably add a fixme comment and/or file a bug about that.

Done and done.

bors-servo · 2017-08-11T16:01:12Z

💔 Test failed - linux-dev

mbrubeck · 2017-08-11T20:23:01Z

💔 Test failed - linux-dev

This is #18051.

nox · 2017-08-12T10:58:12Z

Cargo.toml

@@ -15,6 +15,9 @@ opt-level = 3
 # lto = false

 [patch.crates-io]
+# FIXME: https://github.com/servo/servo/issues/18044
+xcb = {git = "https://github.com/servo/rust-xcb", rev = "servo_issue18044_do_not_remove"}


Can cargo vendor on Gecko's side even cope with that, btw?

This Cargo.toml is not "top-level" in Gecko, so that section is ignored. Which doesn’t matter because xcb is not in Gecko’s dependency graph anyway.

SimonSapin · 2017-08-14T10:44:39Z

Testing with a temporary branch from upstream, do not merge as-is. rtbo/rust-xcb#40 (comment)

@bors-servo try

bors-servo · 2017-08-14T10:44:44Z

⌛ Trying commit fa85353 with merge 1eaf82a...


        Auto merge of #18046 - servo:rustup, r=<try>

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18046)

bors-servo · 2017-08-14T12:26:56Z

☀️ Test successful - android, 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
State: approved= try=True

SimonSapin · 2017-08-15T11:13:12Z

@bors-servo r=emilio

bors-servo · 2017-08-15T11:13:13Z

📌 Commit 3a9f2d5 has been approved by emilio

bors-servo · 2017-08-15T11:46:47Z

⌛ Testing commit 3a9f2d5 with merge 7f0dca1...


        Auto merge of #18046 - servo:rustup, r=emilio

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18046)

bors-servo · 2017-08-15T11:52:59Z

💔 Test failed - linux-rel-wpt


        Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)

SimonSapin · 2017-08-15T12:21:41Z

Fixed another warning-as-error in code that was added since this PR was first opened.

@bors-servo r=emilio

bors-servo · 2017-08-15T12:21:41Z

📌 Commit b5a4b8d has been approved by emilio

bors-servo · 2017-08-15T12:31:06Z

⌛ Testing commit b5a4b8d with merge 7d9b82b...


        Auto merge of #18046 - servo:rustup, r=emilio

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18046)

bors-servo · 2017-08-15T13:05:51Z

💔 Test failed - linux-rel-wpt

emilio · 2017-08-15T13:35:18Z

@bors-servo retry #17168

bors-servo · 2017-08-15T13:51:18Z

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css2, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt, mac-rel-css1, mac-rel-wpt1...

bors-servo · 2017-08-15T14:38:57Z

☀️ Test successful - android, 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: emilio
Pushing 7d9b82b to master...

highfive assigned pcwalton Aug 11, 2017

highfive added the S-awaiting-review label Aug 11, 2017

highfive assigned emilio and unassigned pcwalton Aug 11, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 11, 2017

mbrubeck reviewed Aug 11, 2017

View changes

highfive added S-tests-failed and removed S-awaiting-merge labels Aug 11, 2017

nox reviewed Aug 12, 2017

View changes

highfive added S-awaiting-review and removed S-tests-failed labels Aug 14, 2017

SimonSapin force-pushed the rustup branch 2 times, most recently from b112f63 to 3a9f2d5 Aug 14, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 15, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Aug 15, 2017

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)

Loading status checks…

b5a4b8d

SimonSapin force-pushed the rustup branch from 3a9f2d5 to b5a4b8d Aug 15, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Aug 15, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 15, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Aug 15, 2017

bors-servo merged commit b5a4b8d into master Aug 15, 2017
2 checks passed

2 checks passed

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

homu Test successful
Details

bors-servo mentioned this pull request Aug 15, 2017

selectors: Fix some unused mut warnings. #18089

Closed

SimonSapin deleted the rustup branch Aug 15, 2017

jdm mentioned this pull request Aug 16, 2017

Android builder runs out of memory #18116

Closed

SimonSapin mentioned this pull request Aug 17, 2017

Unfork rust-xcb #18044

Closed

servo / servo

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) #18046

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) #18046

SimonSapin commented Aug 11, 2017 •

edited

highfive commented Aug 11, 2017

emilio commented Aug 11, 2017

bors-servo commented Aug 11, 2017

bors-servo commented Aug 11, 2017

This comment has been minimized.

This comment has been minimized.

bors-servo commented Aug 11, 2017

mbrubeck commented Aug 11, 2017

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Aug 14, 2017

bors-servo commented Aug 14, 2017

bors-servo commented Aug 14, 2017

SimonSapin commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

SimonSapin commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

emilio commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

servo / servo

Join GitHub today

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) #18046

Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) #18046

Conversation

SimonSapin commented Aug 11, 2017 • edited

highfive commented Aug 11, 2017

emilio commented Aug 11, 2017

bors-servo commented Aug 11, 2017

bors-servo commented Aug 11, 2017

This comment has been minimized.

mbrubeck Aug 11, 2017

This comment has been minimized.

SimonSapin Aug 15, 2017

bors-servo commented Aug 11, 2017

mbrubeck commented Aug 11, 2017

This comment has been minimized.

nox Aug 12, 2017

This comment has been minimized.

SimonSapin Aug 13, 2017

SimonSapin commented Aug 14, 2017

bors-servo commented Aug 14, 2017

bors-servo commented Aug 14, 2017

SimonSapin commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

SimonSapin commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

emilio commented Aug 15, 2017

bors-servo commented Aug 15, 2017

bors-servo commented Aug 15, 2017

SimonSapin commented Aug 11, 2017 •

edited