yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-03 01:39:28 +02:00
Code Issues Releases Wiki Activity

Enable deprecation warnings and address

Browse source
This commit is contained in:
George Hahn 2024-06-06 00:47:02 -06:00
parent 8f9bec21d7
commit 98a97588d3
6 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/http_client.rs
View file

@ -11,9 +11,7 @@ use governor::{
};
use http::{header::HeaderValue, Uri};
use hyper::{
client::{HttpConnector, ResponseFuture},
header::USER_AGENT,
Body, Client, HeaderMap, Request, Response, StatusCode,
body::HttpBody, client::{HttpConnector, ResponseFuture}, header::USER_AGENT, Body, Client, HeaderMap, Request, Response, StatusCode
};
use hyper_proxy::{Intercept, Proxy, ProxyConnector};
use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
@ -178,9 +176,7 @@ impl HttpClient {
// As correct as that may be technically, we now need all this boilerplate to clone it
// ourselves, as any `Request` is moved in the loop.
let (parts, body) = req.into_parts();
let body_as_bytes = hyper::body::to_bytes(body)
.await
.unwrap_or_else(|_| Bytes::new());
let body_as_bytes = body.collect().await.map(|b| b.to_bytes()).unwrap_or_default();
loop {
let mut req = Request::builder()
@ -218,7 +214,7 @@ impl HttpClient {
pub async fn request_body(&self, req: Request<Body>) -> Result<Bytes, Error> {
let response = self.request(req).await?;
Ok(hyper::body::to_bytes(response.into_body()).await?)
Ok(response.into_body().collect().await?.to_bytes())
}
pub fn request_stream(&self, req: Request<Body>) -> Result<IntoStream<ResponseFuture>, Error> {