Merge pull request #197 from elastic-rs/fix/into-raw-method

Deprecate ResponseBuilder.raw

benches/rust/elastic_raw/src/main.rs

@@ -9,6 +9,7 @@ extern crate elastic;
 
 use std::env;
 use std::io::Read;
+use time::Duration;
 use stopwatch::Stopwatch;
 
 use elastic::http;
@@ -44,14 +45,17 @@ fn main() {
         let mut sw = Stopwatch::start_new();
 
         let req = SearchRequest::for_index_ty("bench_index", "bench_doc", BODY);
-        let mut res = client.request(req).send().unwrap().raw();
+        let mut res = client.request(req).send().unwrap().into_raw();
 
         let mut buf = Vec::new();
         res.read_to_end(&mut buf).unwrap();
 
         sw.stop();
 
         test::black_box(buf);
+
+        let elapsed = Duration::from_std(sw.elapsed()).unwrap();
+        results.push(elapsed.num_nanoseconds().unwrap());
     }
 
     results.sort();

benches/rust/rs-es/Cargo.toml

@@ -7,8 +7,8 @@ authors = ["Ashley Mannix <[email protected]>"]
 ssl = ["rs-es/ssl"]
 
 [dependencies]
-serde = "~0.9"
-serde_derive = "~0.9"
+serde = "~1"
+serde_derive = "~1"
 
 rs-es = { version = "*", default-features = false }
 

derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "elastic_derive"
-version = "0.12.0"
+version = "0.12.2"
 authors = ["Ashley Mannix <[email protected]>"]
 license = "Apache-2.0"
 description = "Compile-time code generation for Elasticsearch type implementations."

elastic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "elastic"
-version = "0.12.0"
+version = "0.12.2"
 authors = ["Ashley Mannix <[email protected]>"]
 license = "Apache-2.0"
 keywords = ["elasticsearch", "search"]

elastic/src/client/mod.rs

@@ -412,7 +412,7 @@ pub fn into_response<T>(res: ResponseBuilder) -> Result<T>
 
 /** Try convert a `ResponseBuilder` into a raw response type. */
 pub fn into_raw(res: ResponseBuilder) -> Result<HttpResponse> {
-    Ok(res.raw())
+    Ok(res.into_raw())
 }
 
 struct IntoResponse(RawResponse);

elastic/src/client/responses/mod.rs

@@ -43,13 +43,23 @@ impl ResponseBuilder {
     
     Convert the builder into a raw HTTP response that implements `Read`.
     */
+    #[deprecated(note = "use `into_raw`")]
     pub fn raw(self) -> HttpResponse {
+        self.into_raw()
+    }
+
+    /**
+    Get the response body from JSON.
+    
+    Convert the builder into a raw HTTP response that implements `Read`.
+    */
+    pub fn into_raw(self) -> HttpResponse {
         self.0
     }
 
     /** Get a raw http response. */
     fn reqwest_response(self) -> RawResponse {
-        self.raw().0
+        self.into_raw().0
     }
 
     /**