Skip to content

Commit

Permalink
Auto merge of #2577 - servo:serdeup, r=<try>
Browse files Browse the repository at this point in the history
WIP: Upgrade serde

This will enable using serde-rs/serde#1191 in Servo

<!-- 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/2577)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Mar 27, 2018
2 parents 9893ea1 + 734822b commit 1a12a10
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 47 deletions.
92 changes: 48 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ debug = true
panic = "abort"

[patch.crates-io]
serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature="deserialize_in_place" }
serde_derive = { git = "https://github.com/SimonSapin/serde", branch = "deserialize_from_enums5", feature="deserialize_in_place" }
4 changes: 2 additions & 2 deletions webrender_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ bitflags = "1.0"
byteorder = "1.2.1"
ipc-channel = {version = "0.10.0", optional = true}
euclid = { version = "0.17", features = ["serde"] }
serde = { version = "=1.0.27", features = ["rc"] }
serde_derive = { version = "=1.0.27", features = ["deserialize_in_place"] }
serde = { version = "=1.0.35", features = ["rc"] }
serde_derive = { version = "=1.0.35", features = ["deserialize_in_place"] }
time = "0.1"

[target.'cfg(target_os = "macos")'.dependencies]
Expand Down

0 comments on commit 1a12a10

Please sign in to comment.