From 371c3ebf92ff71cea12fe30cf17c70c8506527fb Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@sentry.io>
Date: Wed, 30 Sep 2020 12:26:26 +0200
Subject: [PATCH] fix: Update surf and unbreak CI

---
 sentry/Cargo.toml       |  5 ++---
 sentry/src/transport.rs | 12 +++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
index c5c460b80..31931fa56 100644
--- a/sentry/Cargo.toml
+++ b/sentry/Cargo.toml
@@ -37,7 +37,7 @@ debug-logs = ["log_", "sentry-core/debug-logs"]
 transport = ["reqwest", "native-tls"]
 reqwest = ["reqwest_", "httpdate"]
 curl = ["curl_", "httpdate", "serde_json"]
-surf = ["surf_", "httpdate", "http-client", "futures"]
+surf = ["surf_", "httpdate", "futures"]
 native-tls = ["reqwest_/default-tls"]
 rustls = ["reqwest_/rustls-tls"]
 
@@ -55,8 +55,7 @@ sentry-slog = { version = "0.20.1", path = "../sentry-slog", optional = true }
 log_ = { package = "log", version = "0.4.8", optional = true, features = ["std"] }
 reqwest_ = { package = "reqwest", version = "0.10.8", optional = true, features = ["blocking", "json"], default-features = false }
 curl_ = { package = "curl", version = "0.4.25", optional = true }
-surf_ = { package = "surf", version = "=2.0.0-alpha.4", optional = true }
-http-client = { version = "3.0", optional = true }
+surf_ = { package = "surf", version = "=2.0.0-alpha.7", optional = true }
 futures = { version = "0.3", optional = true }
 httpdate = { version = "0.3.2", optional = true }
 serde_json = { version = "1.0.48", optional = true }
diff --git a/sentry/src/transport.rs b/sentry/src/transport.rs
index c8b982d86..38c03831f 100644
--- a/sentry/src/transport.rs
+++ b/sentry/src/transport.rs
@@ -22,8 +22,6 @@ use std::io::{Cursor, Read};
 #[cfg(feature = "surf")]
 use futures::executor;
 #[cfg(feature = "surf")]
-use http_client::native::NativeClient;
-#[cfg(feature = "surf")]
 use surf_::Client as SurfClient;
 
 use sentry_core::sentry_debug;
@@ -424,7 +422,7 @@ implement_http_transport! {
         signal: Arc<Condvar>,
         shutdown_immediately: Arc<AtomicBool>,
         queue_size: Arc<Mutex<usize>>,
-        http_client: SurfClient<NativeClient>,
+        http_client: SurfClient,
     ) {
         let dsn = options.dsn.clone().unwrap();
         let user_agent = options.user_agent.to_string();
@@ -464,11 +462,11 @@ implement_http_transport! {
 
                     let fut = http_client
                         .post(url.as_str())
-                        .set_header(
+                        .header(
                             "X-Sentry-Auth",
                             dsn.to_auth(Some(&user_agent)).to_string()
                         )
-                        .body_bytes(body);
+                        .body(body);
 
                     match executor::block_on(fut) {
                         Ok(resp) => {
@@ -499,8 +497,8 @@ implement_http_transport! {
 
     fn http_client(
         _options: &ClientOptions,
-        client: Option<SurfClient<NativeClient>>
-    ) -> SurfClient<NativeClient> {
+        client: Option<SurfClient>
+    ) -> SurfClient {
         client.unwrap_or_else(SurfClient::new)
     }
 }