Require at least plane-split 0.4. #1315
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@bors-servo r+ |
|
📌 Commit 9be1015 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
May 31, 2017
Require at least plane-split 0.4. Older versions of plane-split (e.g. 0.3.0) use an older version of euclid (0.11 instead of 0.13), and so webrender doesn't actually compile with that. The compilation failures come from a mismatch of type names, such as euclid::rect::TypedRect vs euclid::TypedRect. The Cargo.lock file already uses plane-split 0.4.0 but downstream dependencies of webrender that try to use it with an older plane-split will run into this problem. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1315) <!-- Reviewable:end -->
|
💔 Test failed - status-travis |
|
@bors-servo retry |
|
@staktrace: 🔑 Insufficient privileges: and not in try users |
|
Shoot. The failures seem to be just OS X timeouts. Can somebody else convince bors to retry? |
|
@bors-servo retry |
kvark
reviewed
May 31, 2017
webrender/Cargo.toml
Outdated
| @@ -30,7 +30,7 @@ webrender_traits = {path = "../webrender_traits"} | |||
| bitflags = "0.7" | |||
| gamma-lut = "0.2" | |||
| thread_profiler = "0.1.1" | |||
| plane-split = ">= 0.3, < 0.5" | |||
| plane-split = ">= 0.4, < 0.5" | |||
There was a problem hiding this comment.
True. I'll update the patch
Older versions of plane-split (e.g. 0.3.0) use an older version of euclid (0.11 instead of 0.13), and so webrender doesn't actually compile with that. The compilation failures come from a mismatch of type names, such as euclid::rect::TypedRect vs euclid::TypedRect. The Cargo.lock file already uses plane-split 0.4.0 but downstream dependencies of webrender that try to use it with an older plane-split will run into this problem.
|
@bors-servo r+ |
|
📌 Commit 85a0443 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
May 31, 2017
Require at least plane-split 0.4. Older versions of plane-split (e.g. 0.3.0) use an older version of euclid (0.11 instead of 0.13), and so webrender doesn't actually compile with that. The compilation failures come from a mismatch of type names, such as euclid::rect::TypedRect vs euclid::TypedRect. The Cargo.lock file already uses plane-split 0.4.0 but downstream dependencies of webrender that try to use it with an older plane-split will run into this problem. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1315) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Older versions of plane-split (e.g. 0.3.0) use an older version of
euclid (0.11 instead of 0.13), and so webrender doesn't actually compile
with that. The compilation failures come from a mismatch of type names,
such as euclid::rect::TypedRect vs euclid::TypedRect.
The Cargo.lock file already uses plane-split 0.4.0 but downstream
dependencies of webrender that try to use it with an older plane-split
will run into this problem.
This change is