Merge pull request #28 from KodrAus/chore/serde-1.0

Upgrade to serde 1.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Stephan Buys <stephan.buys@panoptix.co.za>"]
 name = "elastic_responses"
-version = "0.6.1"
+version = "0.7.0"
 license = "MIT/Apache-2.0"
 description = "Parses search results from Elasticsearch and presents results using convenient iterators."
 documentation = "https://docs.rs/elastic_responses"
@@ -10,9 +10,9 @@ exclude = [ "samples" ]
 
 [dependencies]
 log = "~0.3"
-serde = "~0.9"
-serde_derive = "~0.9"
-serde_json = "~0.9"
+serde = "~1"
+serde_derive = "~1"
+serde_json = "~1"
 slog = "~1.4"
 slog-envlogger = "~0.5"
 slog-stdlog = "~1.1"

samples/bulk/src/main.rs

@@ -9,7 +9,7 @@ extern crate elastic_responses;
 
 use elastic_reqwest::ElasticClient;
 use elastic_reqwest::req::BulkRequest;
-use elastic_responses::BulkResponse;
+use elastic_responses::{HttpResponse, BulkErrorsResponse};
 
 fn get_req() -> String {
     let mut bulk = String::new();
@@ -30,11 +30,14 @@ fn main() {
 
     let (client, params) = elastic_reqwest::default().unwrap();
 
-    // Send the bulk request.
-    let mut res = client.elastic_req(&params, BulkRequest::new(get_req())).unwrap();
+    // Send the request and read the response.
+    let http_res = {
+        let res = client.elastic_req(&params, BulkRequest::new(get_req())).unwrap();
+        HttpResponse::from_read(res.status().to_u16(), res)
+    };
 
     //Parse body to JSON. You could also use `BulkErrorsResponse`.
-    let body_as_json: BulkResponse = res.json().unwrap();
+    let body_as_json: BulkErrorsResponse = http_res.into_response().unwrap();
 
     println!("{:?}", body_as_json);
 }

samples/search/src/main.rs

@@ -9,7 +9,7 @@ extern crate elastic_responses;
 
 use elastic_reqwest::{ElasticClient};
 use elastic_reqwest::req::SearchRequest;
-use elastic_responses::SearchResponse;
+use elastic_responses::{HttpResponse, SearchResponse};
 
 fn main() {
 
@@ -67,10 +67,13 @@ fn main() {
     });
 
     // Send the request and read the response.
-    let mut res = client.elastic_req(&params, SearchRequest::for_index("_all", body)).unwrap();
+    let http_res = {
+        let res = client.elastic_req(&params, SearchRequest::for_index("_all", body)).unwrap();
+        HttpResponse::from_read(res.status().to_u16(), res)
+    };
 
     //Parse body to JSON
-    let body_as_json: SearchResponse = res.json().unwrap();
+    let body_as_json: SearchResponse = http_res.into_response().unwrap();
 
     //Use hits() or aggs() iterators
     //Hits