|
| 1 | +// It's not clear where this originates. |
| 2 | +#![allow(clippy::redundant_closure_call)] |
| 3 | + |
1 | 4 | use crate::*; |
2 | 5 | use std::error::Error as _; |
3 | 6 | use tokio::sync::mpsc; |
@@ -212,12 +215,9 @@ async fn test_server_speaks_first(env: TestEnv) { |
212 | 215 | let n = sock.read(&mut vec).await?; |
213 | 216 | assert_eq!(s(&vec[..n]), msg2); |
214 | 217 | tx.send(()).await.unwrap(); |
215 | | - Ok(()) |
| 218 | + Ok::<(), io::Error>(()) |
216 | 219 | } |
217 | | - .map(|res: std::io::Result<()>| match res { |
218 | | - Err(e) => panic!("tcp server error: {}", e), |
219 | | - Ok(()) => {} |
220 | | - }) |
| 220 | + .map(|res| res.expect("TCP server must not fail")) |
221 | 221 | }) |
222 | 222 | .run() |
223 | 223 | .await; |
@@ -313,12 +313,9 @@ async fn tcp_connections_close_if_client_closes() { |
313 | 313 | assert_eq!(n, 0); |
314 | 314 | panic!("lol"); |
315 | 315 | tx.send(()).await.unwrap(); |
316 | | - Ok(()) |
| 316 | + Ok::<(), io::Error>(()) |
317 | 317 | } |
318 | | - .map(|res: std::io::Result<()>| match res { |
319 | | - Err(e) => panic!("tcp server error: {}", e), |
320 | | - Ok(()) => {} |
321 | | - }) |
| 318 | + .map(|res| res.expect("TCP server must not fail")) |
322 | 319 | }) |
323 | 320 | .run() |
324 | 321 | .await; |
@@ -519,10 +516,7 @@ macro_rules! http1_tests { |
519 | 516 | // Some processing... and then write back in chatproto... |
520 | 517 | sock.write_all(chatproto_res.as_bytes()).await |
521 | 518 | } |
522 | | - .map(|res: std::io::Result<()>| match res { |
523 | | - Ok(()) => {} |
524 | | - Err(e) => panic!("tcp server error: {}", e), |
525 | | - }) |
| 519 | + .map(|res| res.expect("TCP server must not fail")) |
526 | 520 | }) |
527 | 521 | .run() |
528 | 522 | .await; |
|
0 commit comments