fix: Replace serde_derive with serdes derive feature for all crates

Author: johan-bjareholt

Cargo.lock

@@ -8,7 +8,6 @@ authors = ["Johan Bjäreholt <[email protected]>"]
 reqwest = { version = "0.10", features = ["json", "blocking"] }
 gethostname = "0.2"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 aw-models = { path = "../aw-models" }

aw-client-rust/Cargo.toml

@@ -1,7 +1,6 @@
 extern crate gethostname;
 extern crate reqwest;
 #[macro_use]
-extern crate serde_derive;
 extern crate aw_models;
 extern crate serde_json;
 
@@ -12,12 +11,6 @@ use serde_json::Map;
 
 pub use aw_models::{Bucket, BucketMetadata, Event};
 
-#[derive(Deserialize)]
-pub struct Info {
-    pub hostname: String,
-    pub testing: bool,
-}
-
 #[derive(Debug)]
 pub struct AwClient {
     client: reqwest::blocking::Client,
@@ -120,7 +113,7 @@ impl AwClient {
         Ok(count)
     }
 
-    pub fn get_info(&self) -> Result<Info, reqwest::Error> {
+    pub fn get_info(&self) -> Result<aw_models::Info, reqwest::Error> {
         let url = format!("{}/api/0/info", self.baseurl);
         Ok(self.client.get(&url).send()?.json()?)
     }

aw-client-rust/src/lib.rs

@@ -12,7 +12,6 @@ legacy_import_tests = []
 appdirs = "0.2"
 serde = "1.0"
 serde_json = "1.0"
-serde_derive = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 rusqlite = { version = "0.23", features = ["chrono", "serde_json", "bundled"]  }
 mpsc_requests = "0.3"

aw-datastore/Cargo.toml

@@ -7,9 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_derive = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 plex = "0.2.3"
 log = "0.4"

aw-query/Cargo.toml

@@ -7,7 +7,7 @@ use super::QueryError;
 use aw_models::Event;
 use aw_transform::classify::{RegexRule, Rule};
 
-use serde::Serializer;
+use serde::{Serialize, Serializer};
 use serde_json::value::Value;
 use serde_json::Number;
 

aw-query/src/datatype.rs

@@ -2,8 +2,6 @@
 extern crate log;
 extern crate serde;
 extern crate serde_json;
-#[macro_use]
-extern crate serde_derive;
 
 use std::fmt;
 

aw-query/src/lib.rs

@@ -18,9 +18,8 @@ rocket = "0.4"
 rocket_contrib = { version = "*", default-features = false, features = ["json"] }
 rocket_cors = "0.5"
 multipart = { version = "0.17", default-features = false, features = ["server"] }
-serde = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_derive = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 appdirs = "0.2.0"
 lazy_static = "1.2"

aw-server/Cargo.toml

@@ -1,7 +1,9 @@
-use rocket::config::{Config, Environment, Limits};
 use std::fs::File;
 use std::io::{Read, Write};
 
+use rocket::config::{Config, Environment, Limits};
+use serde::{Deserialize, Serialize};
+
 use crate::dirs;
 
 /* Far from an optimal way to solve it, but works and is simple */

aw-server/src/config.rs

@@ -4,6 +4,7 @@ use rocket::http::ContentType;
 use rocket::http::Status;
 use rocket::request::Request;
 use rocket::response::{self, Responder, Response};
+use serde::Serialize;
 
 #[derive(Serialize, Debug)]
 pub struct HttpErrorJson {

aw-server/src/endpoints/util.rs

@@ -10,8 +10,6 @@ extern crate rocket_cors;
 
 extern crate serde;
 extern crate serde_json;
-#[macro_use]
-extern crate serde_derive;
 
 extern crate chrono;