From f4f6d0881a520f74a6edf298a267d30323a69330 Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Tue, 5 Jan 2021 14:18:04 -0500
Subject: [PATCH 1/3] Upgrade to `tokio 1.0` and `reqwest 0.11`

This upgrades `sentry-core` and `sentry` to the new releases.
`sentry-actix` is still based on `tokio 0.2`
---
 sentry-core/Cargo.toml | 2 +-
 sentry/Cargo.toml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sentry-core/Cargo.toml b/sentry-core/Cargo.toml
index c3c3a809..18b1fb34 100644
--- a/sentry-core/Cargo.toml
+++ b/sentry-core/Cargo.toml
@@ -38,4 +38,4 @@ log_ = { package = "log", version = "0.4.8", optional = true, features = ["std"]
 sentry = { version = "0.21.0", path = "../sentry", default-features = false, features = ["test"] }
 thiserror = "1.0.15"
 anyhow = "1.0.30"
-tokio = { version = "0.2", features = ["rt-core", "macros"] }
+tokio = { version = "1.0", features = ["rt", "macros"] }
diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
index d0aebb4f..5574880f 100644
--- a/sentry/Cargo.toml
+++ b/sentry/Cargo.toml
@@ -48,7 +48,7 @@ sentry-log = { version = "0.21.0", path = "../sentry-log", optional = true }
 sentry-panic = { version = "0.21.0", path = "../sentry-panic", optional = true }
 sentry-slog = { version = "0.21.0", 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 }
+reqwest_ = { package = "reqwest", version = "0.11", optional = true, features = ["blocking", "json"], default-features = false }
 curl_ = { package = "curl", version = "0.4.25", optional = true }
 surf_ = { package = "surf", version = "2.0.0", optional = true }
 futures = { version = "0.3", optional = true }
@@ -62,6 +62,6 @@ sentry-slog = { version = "0.21.0", path = "../sentry-slog" }
 log_ = { package = "log", version = "0.4.8", features = ["std"] }
 slog_ = { package = "slog", version = "2.5.2" }
 actix-web = { version = "3", default-features = false }
-tokio = { version = "0.2", features = ["macros"] }
+tokio = { version = "1.0", features = ["macros"] }
 pretty_env_logger = "0.4.0"
 anyhow_ = { package = "anyhow", version = "1.0.30" }

From f9df15cc73affa261d17b6651ff0377ef5b5a4f7 Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Wed, 6 Jan 2021 18:58:59 -0500
Subject: [PATCH 2/3] Bump the MSRV to 1.45.0

---
 .github/workflows/ci.yml | 2 +-
 README.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3064a073..699f61f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [1.42.0]
+        rust: [1.45.0]
 
     name: checkfast/testfast using ${{ matrix.rust }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
diff --git a/README.md b/README.md
index f7776c48..35918668 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ best API and adding new features.
 We currently only verify this crate against a recent version of Sentry hosted on [sentry.io](https://sentry.io/) but it
 should work with on-prem Sentry versions 8.20 and later.
 
-Additionally, the lowest Rust version we target is _1.42.0_.
+Additionally, the lowest Rust version we target is _1.45.0_.
 
 ## Resources
 

From 41f066fb0572d9b28a8d1a92897cba63a0cd8357 Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Wed, 6 Jan 2021 19:01:32 -0500
Subject: [PATCH 3/3] Fix an unnecessary mut warning

---
 sentry-core/src/futures.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry-core/src/futures.rs b/sentry-core/src/futures.rs
index c1672160..dd8d4d71 100644
--- a/sentry-core/src/futures.rs
+++ b/sentry-core/src/futures.rs
@@ -74,7 +74,7 @@ mod tests {
     #[test]
     fn test_futures() {
         let mut events = with_captured_events(|| {
-            let mut runtime = Runtime::new().unwrap();
+            let runtime = Runtime::new().unwrap();
 
             // spawn two separate tasks, and await them in the end.
             runtime.block_on(async {