From 4168ba31f690906b4170968c683279112830554a Mon Sep 17 00:00:00 2001 From: p11 Date: Thu, 19 Sep 2024 14:24:28 +0200 Subject: [PATCH] Supply methods directly instead of closures --- src/main.rs | 10 ++++------ src/request.rs | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 7a8c548..b5bbb0d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -563,9 +563,7 @@ fn handle_relative_connection( } convert_subheader( - BufReader::new(file) - .lines() - .map(|line| line.unwrap_or_default()), + BufReader::new(file).lines().map(Result::unwrap_or_default), output, level, ); @@ -577,7 +575,7 @@ fn handle_relative_connection( if let Some(i) = partial { let mut last_empty = true; let mut block = 0; - let lines: Vec<_> = lines.map(|line| line.unwrap_or_default()).collect(); + let lines: Vec<_> = lines.map(Result::unwrap_or_default).collect(); let mut lines = lines.into_iter(); if i > 0 { for line in lines.by_ref() { @@ -649,7 +647,7 @@ fn handle_relative_connection( } let _ = writeln!(stream, "< Play >"); convert_extended( - lines.map(|line| line.unwrap_or_default()), + lines.map(Result::unwrap_or_default), &mut stream, Settings::default() .with_handler(handle_entry) @@ -677,7 +675,7 @@ fn handle_relative_connection( } let lines = BufReader::new(pki_file).lines(); - convert_subheader(lines.map(|line| line.unwrap_or_default()), &mut stream, 1); + convert_subheader(lines.map(Result::unwrap_or_default), &mut stream, 1); section(&mut stream); } else { diff --git a/src/request.rs b/src/request.rs index fca12be..28459e4 100644 --- a/src/request.rs +++ b/src/request.rs @@ -46,7 +46,7 @@ impl Request { let mut request_lines = request_lines.into_iter(); request_lines.next(); - let headers: Vec = request_lines.map(|header| header.to_string()).collect(); + let headers: Vec = request_lines.map(str::to_string).collect(); Some(Self { method,