Bump serde to 1.0 #1359
Bump serde to 1.0 #1359
Conversation
|
Won't work on mac.
I don't have a mac and hope it would just work (and of course it didn't) |
Eijebong
force-pushed
the
serde1.0
branch
2 times, most recently
from
41df376 to
2445a69
Compare
|
Thank you so much @killercup for checking/fixing those mac related failures :) |
|
Holding off on merging after discussing with @nox - please let me know when this is good to go though! |
|
Well I'm waiting for the euclid 0.14 bump to land in servo and then we're good to go I think (the servo PR is ready modulo euclid) |
|
We're holding off on merging this while @bholley lands a small change in WR to update rayon. Once that's landed, I'm fine with landing this (if everything else is ready to go). |
|
☔ The latest upstream changes (presumably #1382) made this pull request unmergeable. Please resolve the merge conflicts. |
wrench/Cargo.toml
Outdated
| serde_derive = "0.9" | ||
| serde = "0.9" | ||
| serde_derive = "1.0" | ||
| serde = "1.0" |
There was a problem hiding this comment.
Can you use the derive feature of serde instead of explicitly depending on serde_derive?
| @@ -7,7 +7,7 @@ license = "MPL-2.0" | |||
|
|
|||
| [dependencies] | |||
| base64 = "0.3" | |||
| bincode = "1.0.0-alpha2" | |||
| bincode = "0.8" | |||
There was a problem hiding this comment.
Why from a 1.0 alpha to 0.8? Can someone explain to me what's going on with bincode's versioning? It's so confusing.
There was a problem hiding this comment.
I don't know anything about bincode's versioning, but 0.8 is the only version supporting serde 1.0, that's why I chose it
|
@Eijebong Can all those [replace] sections be removed now, or are we still waiting on some to land? |
|
We're waiting on this matprec/rust-font-loader@d1aa8db#diff-80398c5faae3c069e4e6aa2ed11b28c0 which is waiting on servo/rust-fontconfig@309d323 |
|
@bors-servo r+ |
|
📌 Commit 0957013 has been approved by |
|
@bors-servo r- |
|
@bors-servo r+ |
|
📌 Commit 28f5601 has been approved by |
Bump serde to 1.0 Still have all those replaces, but we're almost here ! <!-- 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/1359) <!-- Reviewable:end -->
|
💔 Test failed - status-travis |
|
@Eijebong The servo-tidy script failed CI due to multiple bitflags crates present. |
|
Since the serde update has already landed in some other dependencies but not in Servo, landing serde 1.0 in Servo is blocking getting new unrelated changes from these dependencies into Servo. Bitflags is small and 0.7.0 (the older version) is used in 5 crates by likely as many maintainers. So let’s not block on deduplicating bitflags. I’ve filed #1391. @Eijebong, please add |
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 -->
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 -->
Still have all those replaces, but we're almost here !
This change is