fix: breaking API in surf 2.0.0-alpha5

fMeow · Sep 15, 2020 · 349cd16 · 349cd16
1 parent cff0653
commit 349cd16
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,9 +21,9 @@ status = "actively-developed"
 [features]
 default = [ "rocksdb", "reqwest_async" ]
 blocking = [ "maybe-async/is_sync" ]
-reqwest_async = [ "reqwest" ]
+reqwest_async = [ "reqwest"]
 reqwest_blocking = [ "reqwest/blocking", "blocking" ]
-surf_async = [ "surf" ]
+surf_async = [ "surf", "http-types" ]
 cluster = [ ]
 enterprise = [ ]
 mmfiles = [ ]
@@ -52,7 +52,11 @@ url = "2"
   optional = true
 
   [dependencies.surf]
-  version = "2.0.0-alpha.4"
+  version = "2.0.0-alpha.5"
+  optional = true
+
+  [dependencies.http-types]
+  version = "2.0.0"
   optional = true
 
 [dev-dependencies]

diff --git a/src/client/surf.rs b/src/client/surf.rs
@@ -29,7 +29,7 @@ impl ClientExt for SurfClient {
         &self,
         request: http::Request<String>,
     ) -> Result<http::Response<String>, ClientError> {
-        use ::surf::http_types::headers::HeaderName as SurfHeaderName;
+        use http_types::headers::HeaderName as SurfHeaderName;
 
         let method = request.method().clone();
         let url = request.uri().to_owned().to_string();
@@ -50,20 +50,20 @@ impl ClientExt for SurfClient {
         };
 
         let req = self.headers.iter().fold(req, |req, (k, v)| {
-            req.set_header(
+            req.header(
                 SurfHeaderName::from_str(k.as_str()).unwrap(),
                 v.to_str().unwrap(),
             )
         });
         let req = request.headers().iter().fold(req, |req, (k, v)| {
-            req.set_header(
+            req.header(
                 SurfHeaderName::from_str(k.as_str()).unwrap(),
                 v.to_str().unwrap(),
             )
         });
 
         let mut resp = req
-            .body_string(text.to_owned())
+            .body(text.to_owned())
             .await
             .map_err(|e| ClientError::HttpClient(format!("{:?}", e)))?;
 
@@ -95,11 +95,11 @@ impl ClientExt for SurfClient {
         }
 
         let http_version = version.map(|v| match v {
-            ::surf::http_types::Version::Http0_9 => Version::HTTP_09,
-            ::surf::http_types::Version::Http1_0 => Version::HTTP_10,
-            ::surf::http_types::Version::Http1_1 => Version::HTTP_11,
-            ::surf::http_types::Version::Http2_0 => Version::HTTP_2,
-            ::surf::http_types::Version::Http3_0 => Version::HTTP_3,
+            http_types::Version::Http0_9 => Version::HTTP_09,
+            http_types::Version::Http1_0 => Version::HTTP_10,
+            http_types::Version::Http1_1 => Version::HTTP_11,
+            http_types::Version::Http2_0 => Version::HTTP_2,
+            http_types::Version::Http3_0 => Version::HTTP_3,
             _ => unreachable!(),
         });