diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-16 05:03:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 05:03:18 -0700 |
| commit | 66c130d55aa0d7af1104c00e93a5bf950f23a383 (patch) | |
| tree | 6896ae8b01e5d3dd26c97c11950fcd61acd4b883 /components/msg | |
| parent | e1bce241291683ee61abab042d0c808ae5396e91 (diff) | |
| parent | 605ef8b7ecd31aead8c29dcc034bcf1e4f3c73c7 (diff) | |
| download | servo-66c130d55aa0d7af1104c00e93a5bf950f23a383.tar.gz servo-66c130d55aa0d7af1104c00e93a5bf950f23a383.zip | |
Auto merge of #17355 - servo:serdeup, r=nox
Bump serde to 1.0
This is a rebase of #17325 with `[replace]` entries removed, a bunch more dependencies updated, and some more compile fixes. Original work by @Eijebong, thanks a lot!
<!-- 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/17355)
<!-- Reviewable:end -->
Diffstat (limited to 'components/msg')
| -rw-r--r-- | components/msg/Cargo.toml | 3 | ||||
| -rw-r--r-- | components/msg/lib.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 4547152404a..c09d9b40bcb 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -13,6 +13,5 @@ path = "lib.rs" bitflags = "0.7" heapsize = "0.4" heapsize_derive = "0.1" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 8014597a2f4..074b62a9676 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -8,8 +8,7 @@ extern crate bitflags; extern crate heapsize; #[macro_use] extern crate heapsize_derive; -#[macro_use] -extern crate serde_derive; +#[macro_use] extern crate serde; extern crate webrender_traits; pub mod constellation_msg; |