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/net/lib.rs | |
| 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/net/lib.rs')
| -rw-r--r-- | components/net/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/net/lib.rs b/components/net/lib.rs index f96a6fbf2c0..14df9dcc684 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -28,9 +28,7 @@ extern crate net_traits; extern crate openssl; extern crate parse_hosts; extern crate profile_traits; -extern crate serde; -#[macro_use] -extern crate serde_derive; +#[macro_use] extern crate serde; extern crate serde_json; extern crate servo_config; extern crate servo_url; |