Merge pull request #122 from EmbarkStudios/master

Fix duplicate import by simplifying imports

Cargo.toml

@@ -9,8 +9,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-serde = "1.0.79"
-serde_derive = "1.0.107"
+serde = { version = "1.0.79", features = ["derive"] }
 serde_json = "1.0.1"
 
 [dependencies.semver]

src/dependency.rs

@@ -1,8 +1,7 @@
 //! This module contains `Dependency` and the types/functions it uses for deserialization.
 
 use semver::VersionReq;
-use serde::{Deserialize, Deserializer};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use std::fmt;
 
 #[derive(PartialEq, Clone, Debug, Copy, Serialize, Deserialize)]

src/diagnostic.rs

@@ -1,6 +1,6 @@
 //! This module contains `Diagnostic` and the types/functions it uses for deserialization.
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::fmt;
 
 /// The error code associated to this diagnostic.

src/lib.rs

@@ -95,7 +95,7 @@ pub use messages::parse_messages;
 pub use messages::{
     Artifact, ArtifactProfile, BuildFinished, BuildScript, CompilerMessage, Message, MessageIter,
 };
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 mod dependency;
 pub mod diagnostic;

src/messages.rs

@@ -1,5 +1,5 @@
 use super::{Diagnostic, PackageId, Target};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::io::{self, BufRead, Lines, Read};
 use std::path::PathBuf;