Skip to content

Commit

Permalink
Clippy fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswk committed Feb 28, 2024
1 parent 53d8eec commit 268a2f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions server/src/metrics/actix_web_metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ mod tests {
let (_, request_metrics) =
prom_metrics::test_instantiate_without_tracing_and_logging(Some(registry.clone()));

let mut app = test::init_service(
let app = test::init_service(
App::new()
.wrap(request_metrics.clone())
.service(web::resource("/test_ok").to(test_ok_endpoint))
Expand All @@ -488,19 +488,19 @@ mod tests {
.await;

let req_ok = test::TestRequest::get().uri("/test_ok").to_request();
let resp_ok = test::call_service(&mut app, req_ok).await;
let resp_ok = test::call_service(&app, req_ok).await;
assert_eq!(resp_ok.status(), StatusCode::OK);

let req_client_error = test::TestRequest::get()
.uri("/test_client_error")
.to_request();
let resp_client_error = test::call_service(&mut app, req_client_error).await;
let resp_client_error = test::call_service(&app, req_client_error).await;
assert_eq!(resp_client_error.status(), StatusCode::BAD_REQUEST);

let req_server_error = test::TestRequest::get()
.uri("/test_server_error")
.to_request();
let resp_server_error = test::call_service(&mut app, req_server_error).await;
let resp_server_error = test::call_service(&app, req_server_error).await;
assert_eq!(
resp_server_error.status(),
StatusCode::INTERNAL_SERVER_ERROR
Expand Down Expand Up @@ -533,4 +533,4 @@ mod tests {
"Metric value for status code 500 did not match expected"
);
}
}
}
4 changes: 1 addition & 3 deletions server/src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ pub fn config(tls_config: TlsOptions) -> Result<ServerConfig, EdgeError> {
File::open(tls_config.tls_server_key.expect("No server key").as_path())
.expect("Could not read cert file"),
);
let cert_chain = certs(&mut cert_file)
.filter_map(|f| f.ok())
.collect();
let cert_chain = certs(&mut cert_file).filter_map(|f| f.ok()).collect();
let mut keys: Vec<PrivateKeyDer> = pkcs8_private_keys(&mut key_file)
.filter_map(|f| f.map(PrivateKeyDer::from).ok())
.collect();
Expand Down

0 comments on commit 268a2f3

Please sign in to comment.