diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-09-08 09:47:10 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-09-08 09:47:10 +0200 |
| commit | 8a76e509ec0abda73e40c6e5563d80098580bc14 (patch) | |
| tree | fb3a1162dca265877fee3301bf4cb2bb9ac671d9 /mullvad-problem-report | |
| parent | 3923c6320152e12b01b52cbff9408a0bb80e057a (diff) | |
| parent | 9f05c347a9d07911ffa4643f2f50cace0c331500 (diff) | |
| download | mullvadvpn-8a76e509ec0abda73e40c6e5563d80098580bc14.tar.xz mullvadvpn-8a76e509ec0abda73e40c6e5563d80098580bc14.zip | |
Merge branch 'fix-problem-report-tool'
Diffstat (limited to 'mullvad-problem-report')
| -rw-r--r-- | mullvad-problem-report/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-problem-report/src/lib.rs | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index d7738b52de..d73a5fc08b 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -12,7 +12,6 @@ clap = "2.25" dirs = "2.0" env_logger = "0.7" err-derive = "0.2.1" -futures01 = { version = "0.1", package = "futures" } lazy_static = "1.0" regex = "1.0" uuid = { version = "0.8", features = ["v4"] } diff --git a/mullvad-problem-report/src/lib.rs b/mullvad-problem-report/src/lib.rs index 4265d70268..1c3fa00461 100644 --- a/mullvad-problem-report/src/lib.rs +++ b/mullvad-problem-report/src/lib.rs @@ -1,6 +1,5 @@ #![deny(rust_2018_idioms)] -use futures01::Future; use lazy_static::lazy_static; use regex::Regex; use std::{ @@ -266,7 +265,7 @@ pub fn send_problem_report( let metadata = ProblemReport::parse_metadata(&report_content).unwrap_or_else(|| metadata::collect()); - let runtime = tokio::runtime::Builder::new() + let mut runtime = tokio::runtime::Builder::new() .basic_scheduler() .enable_all() .build() @@ -276,9 +275,8 @@ pub fn send_problem_report( .map_err(Error::CreateRpcClientError)?; let rpc_client = mullvad_rpc::ProblemReportProxy::new(rpc_manager.mullvad_rest_handle()); - rpc_client - .problem_report(user_email, user_message, &report_content, &metadata) - .wait() + runtime + .block_on(rpc_client.problem_report(user_email, user_message, &report_content, &metadata)) .map_err(Error::SendRpcError) } |