From 9f22f46e85d3d45a53aa0ed8b01ab55f2c80c2e1 Mon Sep 17 00:00:00 2001 From: nirasan Date: Fri, 17 May 2019 02:46:00 +0900 Subject: [PATCH] Clarify correct specification of dependency on serde (#525) Closes #494 --- Cargo.toml | 2 +- examples/async_multiple_requests.rs | 2 +- examples/json_typed.rs | 4 +++- src/async_impl/request.rs | 1 + src/error.rs | 5 +++-- src/lib.rs | 3 --- src/request.rs | 1 + src/response.rs | 3 ++- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9635bea..39bda18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ time = "0.1.42" [dev-dependencies] env_logger = "0.6" -serde_derive = "1.0" +serde = { version = "1.0", features = ["derive"] } tokio-tcp = "0.1" libflate = "0.1" doc-comment = "0.3" diff --git a/examples/async_multiple_requests.rs b/examples/async_multiple_requests.rs index e5aafb7..5644f34 100644 --- a/examples/async_multiple_requests.rs +++ b/examples/async_multiple_requests.rs @@ -4,11 +4,11 @@ extern crate futures; extern crate reqwest; extern crate tokio; extern crate serde; -#[macro_use] extern crate serde_derive; extern crate serde_json; use futures::Future; use reqwest::async::{Client, Response}; +use serde::Deserialize; #[derive(Deserialize, Debug)] struct Slideshow { diff --git a/examples/json_typed.rs b/examples/json_typed.rs index cefb1cf..23770a9 100644 --- a/examples/json_typed.rs +++ b/examples/json_typed.rs @@ -4,9 +4,11 @@ //! Rust compile-time type system guaranties though it requires a little bit //! more code. extern crate reqwest; -#[macro_use] extern crate serde_derive; +extern crate serde; extern crate serde_json; +use serde::{Deserialize, Serialize}; + #[derive(Debug, Serialize, Deserialize)] struct Post { id: Option, diff --git a/src/async_impl/request.rs b/src/async_impl/request.rs index f6460f5..d88becd 100644 --- a/src/async_impl/request.rs +++ b/src/async_impl/request.rs @@ -428,6 +428,7 @@ pub(crate) fn replace_headers(dst: &mut HeaderMap, src: HeaderMap) { mod tests { use super::Client; use std::collections::BTreeMap; + use serde::Serialize; #[test] fn add_query_append() { diff --git a/src/error.rs b/src/error.rs index 11c6ea8..067759e 100644 --- a/src/error.rs +++ b/src/error.rs @@ -9,10 +9,11 @@ use {StatusCode, Url}; /// # Examples /// /// ``` -/// #[macro_use] -/// extern crate serde_derive; +/// extern crate serde; /// extern crate reqwest; /// +/// use serde::Deserialize; +/// /// #[derive(Deserialize)] /// struct Simple { /// key: String diff --git a/src/lib.rs b/src/lib.rs index 212d65b..fae1015 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -193,9 +193,6 @@ extern crate mime_guess; #[cfg(feature = "default-tls")] extern crate native_tls; extern crate serde; -#[cfg(test)] -#[macro_use] -extern crate serde_derive; extern crate serde_json; extern crate serde_urlencoded; extern crate time; diff --git a/src/request.rs b/src/request.rs index a158408..9bc5f1c 100644 --- a/src/request.rs +++ b/src/request.rs @@ -582,6 +582,7 @@ mod tests { use {body, Client, Method}; use header::{ACCEPT, HOST, HeaderMap, HeaderValue, CONTENT_TYPE}; use std::collections::{BTreeMap, HashMap}; + use serde::Serialize; use serde_json; use serde_urlencoded; diff --git a/src/response.rs b/src/response.rs index 82dba38..fc6e46f 100644 --- a/src/response.rs +++ b/src/response.rs @@ -186,9 +186,10 @@ impl Response { /// /// ```rust /// # extern crate reqwest; - /// # #[macro_use] extern crate serde_derive; + /// # extern crate serde; /// # /// # use reqwest::Error; + /// # use serde::Deserialize; /// # /// #[derive(Deserialize)] /// struct Ip {