diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-12-06 14:24:00 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-12-06 14:24:00 +0100 |
| commit | 9bd922adf931e1ba2cf2ec55995c06420fe8c46c (patch) | |
| tree | f2cbd3cd2cbbe61376d826cf85fa76923fea0a1e | |
| parent | 8d1162f20694d5d8551879e7ba9b34c817f0caed (diff) | |
| download | tricot-9bd922adf931e1ba2cf2ec55995c06420fe8c46c.tar.gz tricot-9bd922adf931e1ba2cf2ec55995c06420fe8c46c.zip | |
Cargo clippydocker-44
| -rw-r--r-- | src/https.rs | 8 | ||||
| -rw-r--r-- | src/main.rs | 10 | ||||
| -rw-r--r-- | src/reverse_proxy.rs | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/https.rs b/src/https.rs index ce9c61f..6e83c9e 100644 --- a/src/https.rs +++ b/src/https.rs @@ -213,7 +213,7 @@ async fn select_target_and_proxy( let host = if let Some(auth) = req.uri().authority() { auth.as_str() } else { - match req.headers().get("host").map(|x| x.to_str().ok()).flatten() { + match req.headers().get("host").and_then(|x| x.to_str().ok()) { Some(host) => host, None => { return Response::builder() @@ -268,7 +268,7 @@ async fn select_target_and_proxy( debug!("{}{} -> {}", host, path, proxy_to); trace!("Request: {:?}", req); - let response = match do_proxy(&https_config, remote_addr, req, proxy_to).await { + let response = match do_proxy(https_config, remote_addr, req, proxy_to).await { Ok(resp) => resp, Err(e) => Response::builder() .status(StatusCode::BAD_GATEWAY) @@ -279,7 +279,7 @@ async fn select_target_and_proxy( proxy_to.calls_in_progress.fetch_sub(1, Ordering::SeqCst); metrics .request_proxy_duration - .record(received_time.elapsed().as_secs_f64(), &tags); + .record(received_time.elapsed().as_secs_f64(), tags); trace!("Final response: {:?}", response); info!("{} {} {}", method, response.status().as_u16(), uri); @@ -323,7 +323,7 @@ async fn do_proxy( } if https_config.enable_compression { - response = try_compress(response, method, accept_encoding, &https_config).await? + response = try_compress(response, method, accept_encoding, https_config).await? }; Ok(response) diff --git a/src/main.rs b/src/main.rs index 34c80f8..79c4a9b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -192,10 +192,10 @@ async fn main() { let dump_task = tokio::spawn(dump_config_on_change(rx_proxy_config, exit_signal.clone())); - let _ = metrics_task.await.expect("Tokio task await failure"); - let _ = http_task.await.expect("Tokio task await failure"); - let _ = https_task.await.expect("Tokio task await failure"); - let _ = dump_task.await.expect("Tokio task await failure"); + metrics_task.await.expect("Tokio task await failure"); + http_task.await.expect("Tokio task await failure"); + https_task.await.expect("Tokio task await failure"); + dump_task.await.expect("Tokio task await failure"); } async fn dump_config_on_change( @@ -205,7 +205,7 @@ async fn dump_config_on_change( while !*must_exit.borrow() { select!( c = rx_proxy_config.changed() => { - if !c.is_ok() { + if c.is_err() { break; } } diff --git a/src/reverse_proxy.rs b/src/reverse_proxy.rs index 74c43e3..258862b 100644 --- a/src/reverse_proxy.rs +++ b/src/reverse_proxy.rs @@ -178,7 +178,7 @@ async fn create_proxied_response<B: std::default::Default + Send + Sync + 'stati *new_res.headers_mut().unwrap() = new_headers; Ok(new_res.body(B::default())?) } else { - return Err(anyhow!("Switching protocols but not an upgrade request")); + Err(anyhow!("Switching protocols but not an upgrade request")) } } else { *response.headers_mut() = new_headers; |