Merge pull request rust-lang#3545 from euclio/serde-derive

use `derive` feature over `serde_derive` crate

Author: topecongiro

Cargo.lock

@@ -37,8 +37,7 @@ generic-simd = ["bytecount/generic-simd"]
 atty = "0.2"
 itertools = "0.8"
 toml = "0.5"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 unicode-segmentation = "1.0.0"
 regex = "1.0"

Cargo.toml

@@ -72,6 +72,8 @@ macro_rules! create_config {
         use std::collections::HashSet;
         use std::io::Write;
 
+        use serde::{Deserialize, Serialize};
+
         #[derive(Clone)]
         pub struct Config {
             // if a license_template_path has been specified, successfully read, parsed and compiled

src/config/config_type.rs

@@ -5,8 +5,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use std::{cmp, fmt, iter, str};
 
-use serde::de::{Deserialize, Deserializer};
-use serde::ser::{self, Serialize, Serializer};
+use serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json as json;
 
 use syntax::source_map::{self, SourceFile};

src/config/file_lines.rs

@@ -4,7 +4,8 @@ use std::path::{Path, PathBuf};
 
 use atty;
 use config_proc_macro::config_type;
-use serde::de::{Deserialize, Deserializer, SeqAccess, Visitor};
+use serde::de::{SeqAccess, Visitor};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::config::lists::*;
 use crate::config::Config;

src/config/options.rs

@@ -11,8 +11,7 @@ use getopts;
 #[macro_use]
 extern crate log;
 use regex;
-#[macro_use]
-extern crate serde_derive;
+use serde::{Deserialize, Serialize};
 use serde_json as json;
 
 use std::collections::HashSet;

src/format-diff/main.rs

@@ -7,8 +7,6 @@ extern crate derive_new;
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate serde_derive;
 
 use std::cell::RefCell;
 use std::collections::HashMap;