diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-03 06:15:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 06:15:25 -0500 |
| commit | e3493cdd26f6faab0ddf6503ad19f0af169ad880 (patch) | |
| tree | f174e2e7a65b7b3c9b2a13357aa8a9f92fcf0183 /components/servo | |
| parent | c6e15f8ef244a0f3859489ca7f1c7bcc80181468 (diff) | |
| parent | 046a97fa132db36364368a69082efb65b9cb4ee1 (diff) | |
| download | servo-e3493cdd26f6faab0ddf6503ad19f0af169ad880.tar.gz servo-e3493cdd26f6faab0ddf6503ad19f0af169ad880.zip | |
Auto merge of #14040 - nox:custom-derive, r=Ms2ger
Remove last use of custom derive plugin
<!-- 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/14040)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index a2da0461e02..94a45baed82 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1439,6 +1439,8 @@ dependencies = [ "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", |