Skip to content

Commit e1113dd

Browse files
committed
cargo fmt
1 parent da0deb1 commit e1113dd

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

audio/src/fetch/receive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use std::{
77

88
use bytes::Bytes;
99
use futures_util::StreamExt;
10+
use http_body_util::BodyExt;
1011
use hyper::StatusCode;
1112
use tempfile::NamedTempFile;
1213
use tokio::sync::{mpsc, oneshot};
13-
use http_body_util::BodyExt;
1414

1515
use librespot_core::{http_client::HttpClient, session::Session, Error};
1616

core/src/http_client.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ use governor::{
1111
};
1212
use http::{header::HeaderValue, Uri};
1313
use http_body_util::{BodyExt, Full};
14-
use hyper::{
15-
body::Incoming, header::USER_AGENT, HeaderMap, Request, Response, StatusCode
16-
};
14+
use hyper::{body::Incoming, header::USER_AGENT, HeaderMap, Request, Response, StatusCode};
1715
use hyper_proxy2::{Intercept, Proxy, ProxyConnector};
1816
use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
19-
use hyper_util::{client::legacy::{connect::HttpConnector, Client, ResponseFuture}, rt::TokioExecutor};
17+
use hyper_util::{
18+
client::legacy::{connect::HttpConnector, Client, ResponseFuture},
19+
rt::TokioExecutor,
20+
};
2021
use nonzero_ext::nonzero;
2122
use once_cell::sync::OnceCell;
2223
use parking_lot::Mutex;
@@ -249,7 +250,6 @@ impl HttpClient {
249250
))
250251
})?;
251252

252-
253253
Ok(self.hyper_client()?.request(req.map(Full::new)))
254254
}
255255

discovery/src/server.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ use futures_core::Stream;
1616
use futures_util::{FutureExt, TryFutureExt};
1717
use hmac::{Hmac, Mac};
1818
use http_body_util::{BodyExt, Full};
19-
use hyper::{
20-
body::Incoming, Method, Request, Response, StatusCode
21-
};
19+
use hyper::{body::Incoming, Method, Request, Response, StatusCode};
2220

2321
use hyper_util::{rt::TokioIo, server::graceful::GracefulShutdown};
2422
use log::{debug, error, warn};
@@ -246,7 +244,7 @@ impl DiscoveryServer {
246244
pub fn new(config: Config, port: &mut u16) -> Result<Self, Error> {
247245
let (discovery, cred_rx) = RequestHandler::new(config);
248246
let address = SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), *port);
249-
247+
250248
let (close_tx, close_rx) = oneshot::channel();
251249

252250
let listener = match TcpListener::bind(address) {
@@ -271,10 +269,9 @@ impl DiscoveryServer {
271269
}
272270
}
273271

274-
275272
tokio::spawn(async move {
276273
let discovery = Arc::new(discovery);
277-
274+
278275
let server = hyper::server::conn::http1::Builder::new();
279276
let graceful = GracefulShutdown::new();
280277
let mut close_rx = std::pin::pin!(close_rx);

0 commit comments

Comments
 (0)