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

Bump serde to 1.0 #1392

Merged
merged 1 commit into from Jun 16, 2017
Merged

Bump serde to 1.0 #1392

merged 1 commit into from Jun 16, 2017

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jun 16, 2017

This is a rebase of #1359 with bitflags added to the tidy duplicate crates exception list, and version numbers incremented some more to catch up with master. Original work by @Eijebong.

Fixes #1359.


This change is Reviewable

@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

@bors-servo r=glennw,SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

📌 Commit da57667 has been approved by glennw,SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

Testing commit da57667 with merge 0fccde8...

bors-servo added a commit that referenced this pull request Jun 16, 2017
Bump serde to 1.0

This is a rebase of #1359 with `bitflags` added to the tidy duplicate crates exception list, and version numbers incremented some more to catch up with `master`. Original work by @Eijebong.

<!-- 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/1392)
<!-- Reviewable:end -->
@SimonSapin SimonSapin force-pushed the serdeup branch from da57667 to dfeefbd Jun 16, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 16, 2017

@bors-servo r=glennw,SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

📌 Commit dfeefbd has been approved by glennw,SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

Testing commit dfeefbd with merge 0030d93...

bors-servo added a commit that referenced this pull request Jun 16, 2017
Bump serde to 1.0

This is a rebase of #1359 with `bitflags` added to the tidy duplicate crates exception list, and version numbers incremented some more to catch up with `master`. Original work by @Eijebong.

Fixes #1359.

<!-- 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/1392)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

☀️ Test successful - status-travis
Approved by: glennw,SimonSapin
Pushing 0030d93 to master...

@bors-servo bors-servo merged commit dfeefbd into master Jun 16, 2017
4 of 6 checks passed
4 of 6 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
continuous-integration/travis-ci/push The Travis CI build could not complete due to an error
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the serdeup branch Jun 16, 2017
@staktrace
Copy link
Contributor

staktrace commented Jun 20, 2017

@SimonSapin Is there a reason this also bumps core-text to 5.0 from 4.0? It makes webrender fail linking on OS 10.7 builders (which we are still using in m-c).

@staktrace
Copy link
Contributor

staktrace commented Jun 20, 2017

Argh. it looks like core-text 4.0.0 uses core-graphics 0.7.0 which uses serde 0.9.15. core-text 5.0.0 on other other hand uses core-graphics 0.8.1 which doesn't need serde.

@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 20, 2017

I don’t know, I carried that particular change over from #1359. I assume that it’s a cascading effect of upgrading serde being a breaking change in public API, which causes breaking changes in public APIs of dependent crates, etc. What’s the linking issue?

@staktrace
Copy link
Contributor

staktrace commented Jun 20, 2017

core-text 5.0.0 uses the CTFontCopyDefaultCascadeListForLanguages symbol which is only available on OS X 10.8+. So it causes a linker failure, e.g. try push

@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 20, 2017

So this update pull in unrelated changes that had landed in the meantime in core-text-rs? Sounds like that change is what should be fixed.

@staktrace
Copy link
Contributor

staktrace commented Jun 20, 2017

Yeah I'm following up on servo/core-text-rs#57 (comment) as well. That's probably a better way to resolve this.

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

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