Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust to 1.12.0-nightly (9316ae515 2016-07-24) #12586

Merged
merged 1 commit into from Jul 26, 2016
Merged

Update Rust to 1.12.0-nightly (9316ae515 2016-07-24) #12586

merged 1 commit into from Jul 26, 2016

Conversation

@nox
Copy link
Member

nox commented Jul 25, 2016

This change is Reviewable

@highfive
Copy link

highfive commented Jul 25, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/Cargo.toml, components/script_traits/script_msg.rs, components/script_traits/script_msg.rs
@highfive
Copy link

highfive commented Jul 25, 2016

warning Warning warning

  • These commits modify gfx and script code, but no tests are modified. Please consider adding a test!
@nox nox mentioned this pull request Jul 25, 2016
3 of 3 tasks complete
@nox
Copy link
Member Author

nox commented Jul 25, 2016

@bors-servo try p=10

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2016

Trying commit 9822508 with merge 43a8023...

bors-servo added a commit that referenced this pull request Jul 25, 2016
Update Rust to 1.12.0-nightly (936bfea94 2016-07-20)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12586)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2016

💔 Test failed - mac-dev-unit

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2016

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

@nox nox force-pushed the rustup branch from 53a8aed to b6bdf68 Jul 26, 2016
@nox nox force-pushed the rustup branch from b6bdf68 to 3d8eab4 Jul 26, 2016
@nox nox removed the S-needs-rebase label Jul 26, 2016
@nox
Copy link
Member Author

nox commented Jul 26, 2016

@nox nox changed the title Update Rust to 1.12.0-nightly (936bfea94 2016-07-20) Update Rust to 1.12.0-nightly (9316ae515 2016-07-24) Jul 26, 2016
@nox
Copy link
Member Author

nox commented Jul 26, 2016

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jul 26, 2016

@bors-servo retry

@KiChjang
Copy link
Member

KiChjang commented Jul 26, 2016

@bors-servo try- clean

@KiChjang
Copy link
Member

KiChjang commented Jul 26, 2016

@KiChjang
Copy link
Member

KiChjang commented Jul 26, 2016

@bors-servo try- clean try

@KiChjang
Copy link
Member

KiChjang commented Jul 26, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jul 26, 2016

Trying commit 3d8eab4 with merge aeee315...

bors-servo added a commit that referenced this pull request Jul 26, 2016
Update Rust to 1.12.0-nightly (9316ae515 2016-07-24)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12586)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 26, 2016

@nox
Copy link
Member Author

nox commented Jul 26, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jul 26, 2016

📌 Commit 3d8eab4 has been approved by nox

@highfive highfive assigned nox and unassigned emilio Jul 26, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 26, 2016

Testing commit 3d8eab4 with merge 0be8e68...

bors-servo added a commit that referenced this pull request Jul 26, 2016
Update Rust to 1.12.0-nightly (9316ae515 2016-07-24)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12586)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 26, 2016

@bors-servo bors-servo merged commit 3d8eab4 into master Jul 26, 2016
3 of 4 checks passed
3 of 4 checks passed
dependency-ci An error occured
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@wafflespeanut wafflespeanut deleted the rustup branch Jul 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.