Merge branch 'prepare-0.3-release'

Author: faern

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 
+## [0.3.0] - 2018-03-06
+### Changed
+- Move logging of json responses from debug to trace level.
+- Remove `Clone` bound on `Transport` trait.
+
+
 ## [0.2.2] - 2017-10-05
 ### Added
 - Add integration test in http crate. Testing actual network traffic.

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonrpc-client-core"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>"]
 description = "A crate for generating transport agnostic, auto serializing, strongly typed JSON-RPC 2.0 clients"
 readme = "../README.md"
@@ -12,8 +12,8 @@ license = "MIT/Apache-2.0"
 [dependencies]
 error-chain = "0.11"
 futures = "0.1"
-jsonrpc-core = "7.1.1"
-log = "0.3"
+jsonrpc-core = "8.0"
+log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 

core/src/lib.rs

@@ -26,7 +26,8 @@
 //! # Example
 //!
 //! ```rust,ignore
-//! #[macro_use] extern crate jsonrpc_client_core;
+//! #[macro_use]
+//! extern crate jsonrpc_client_core;
 //! extern crate jsonrpc_client_http;
 //!
 //! use jsonrpc_client_http::HttpTransport;
@@ -38,7 +39,9 @@
 //!
 //! fn main() {
 //!     let transport = HttpTransport::new().unwrap();
-//!     let transport_handle = transport.handle("https://api.fizzbuzzexample.org/rpc/").unwrap();
+//!     let transport_handle = transport
+//!         .handle("https://api.fizzbuzzexample.org/rpc/")
+//!         .unwrap();
 //!     let mut client = FizzBuzzClient::new(transport_handle);
 //!     let result1 = client.fizz_buzz(3).call().unwrap();
 //!     let result2 = client.fizz_buzz(4).call().unwrap();
@@ -212,7 +215,6 @@ where
 }
 
 
-
 #[cfg(test)]
 mod tests {
     use super::*;

http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonrpc-client-http"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>"]
 description = "A transport implementation for jsonrpc-client-core based on Hyper and futures"
 readme = "README.md"
@@ -15,20 +15,20 @@ futures = "0.1.15"
 hyper = "0.11"
 hyper-tls = { version = "0.1", optional = true }
 native-tls = { version = "0.1", optional = true }
-log = "0.3"
+log = "0.4"
 tokio-core = "0.1"
 
-jsonrpc-client-core = { version = "0.2.1", path = "../core" }
+jsonrpc-client-core = { version = "0.3", path = "../core" }
 
 [features]
 default = ["tls"]
 tls = ["hyper-tls", "native-tls"]
 
 [dev-dependencies]
-env_logger = "0.4"
-jsonrpc-core = "7.1.1"
-jsonrpc-macros = "7.1.1"
-jsonrpc-http-server = "7.1.1"
+env_logger = "0.5"
+jsonrpc-core = "8.0"
+jsonrpc-macros = "8.0"
+jsonrpc-http-server = "8.0"
 
 
 [badges]

http/src/lib.rs

@@ -206,7 +206,7 @@ impl HttpTransport {
     }
 
     /// Creates a `HttpTransport` backed by the Tokio `Handle` given to it, just like
-    ///[`shared`](#method.shared), but with a custom Hyper Client. See
+    /// [`shared`](#method.shared), but with a custom Hyper Client. See
     /// [`with_client`](#method.with_client) for an example.
     pub fn with_client_shared<C>(client_creator: C, handle: &Handle) -> Result<HttpTransport>
     where
@@ -298,9 +298,7 @@ fn create_request_processing_future<CC: hyper::client::Connect>(
                     future::err(ErrorKind::HttpError(response.status()).into())
                 }
             })
-            .and_then(|response: hyper::Response| {
-                response.body().concat2().from_err()
-            })
+            .and_then(|response: hyper::Response| response.body().concat2().from_err())
             .map(|response_chunk| response_chunk.to_vec())
             .then(move |response_result| {
                 if let Err(_) = response_tx.send(response_result) {

rustfmt.toml

@@ -0,0 +1,14 @@
+required_version = "0.3.8"
+
+# Activation of features, almost objectively better ;)
+reorder_imports = true
+reorder_imported_names = true
+reorder_imports_in_group = true
+use_try_shorthand = true
+condense_wildcard_suffixes = true
+normalize_comments = true
+wrap_comments = true
+
+# Heavily subjective style choices
+comment_width = 100
+blank_lines_upper_bound = 2