From 99c2f1c5355276d41bec7130478464e53bc5c641 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Tue, 28 Jul 2020 09:59:27 +0200
Subject: [PATCH] Fix duplicate import by simplifying imports

---
 Cargo.toml        | 3 +--
 src/dependency.rs | 3 +--
 src/diagnostic.rs | 2 +-
 src/lib.rs        | 2 +-
 src/messages.rs   | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 408d1aaa..f4729044 100644
--- a/Cargo.toml
+++ b/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]
diff --git a/src/dependency.rs b/src/dependency.rs
index e35b014a..28b72f5b 100644
--- a/src/dependency.rs
+++ b/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)]
diff --git a/src/diagnostic.rs b/src/diagnostic.rs
index e06817df..68f8fab6 100644
--- a/src/diagnostic.rs
+++ b/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.
diff --git a/src/lib.rs b/src/lib.rs
index 83b41a9f..f691f480 100644
--- a/src/lib.rs
+++ b/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;
diff --git a/src/messages.rs b/src/messages.rs
index 1eaa5b2a..0ac2edb8 100644
--- a/src/messages.rs
+++ b/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;