From 4a407474e2c450b0103ed427f32799c6d32980e2 Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Sat, 6 Feb 2021 17:20:41 +0100 Subject: [PATCH] client: Port to Isahc 1.0 --- crates/musicus_client/Cargo.toml | 2 +- crates/musicus_client/src/lib.rs | 11 ++++++----- crates/musicus_client/src/register.rs | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/crates/musicus_client/Cargo.toml b/crates/musicus_client/Cargo.toml index 6cde9bd..62a2521 100644 --- a/crates/musicus_client/Cargo.toml +++ b/crates/musicus_client/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2018" [dependencies] -isahc = "0.9.12" +isahc = "1.1.0" musicus_database = { version = "0.1.0", path = "../musicus_database" } serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.59" diff --git a/crates/musicus_client/src/lib.rs b/crates/musicus_client/src/lib.rs index c6b24b8..acd6d45 100644 --- a/crates/musicus_client/src/lib.rs +++ b/crates/musicus_client/src/lib.rs @@ -1,3 +1,4 @@ +use isahc::{AsyncBody, Request, Response}; use isahc::http::StatusCode; use isahc::prelude::*; use serde::Serialize; @@ -88,7 +89,7 @@ impl Client { let success = match response.status() { StatusCode::OK => { - let token = response.text_async().await?; + let token = response.text().await?; self.token.replace(Some(token)); true } @@ -109,7 +110,7 @@ impl Client { .send_async() .await?; - let body = response.text_async().await?; + let body = response.text().await?; Ok(body) } @@ -128,7 +129,7 @@ impl Client { } } - response.text_async().await? + response.text().await? } else { let mut response = if self.login().await? { self.post_priv(url, body).await? @@ -136,14 +137,14 @@ impl Client { Err(Error::LoginFailed)? }; - response.text_async().await? + response.text().await? }; Ok(body) } /// Post something to the server assuming there is a valid login token. - async fn post_priv(&self, url: &str, body: String) -> Result> { + async fn post_priv(&self, url: &str, body: String) -> Result> { let server_url = self.server_url()?; let token = self.token()?; diff --git a/crates/musicus_client/src/register.rs b/crates/musicus_client/src/register.rs index b48e282..efba962 100644 --- a/crates/musicus_client/src/register.rs +++ b/crates/musicus_client/src/register.rs @@ -1,4 +1,5 @@ use crate::{Client, Result}; +use isahc::Request; use isahc::http::StatusCode; use isahc::prelude::*; use serde::{Deserialize, Serialize};