From 971d76c762faaa77ac019efaba5f68478bd82e30 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 1 Jan 2023 01:38:18 -0800 Subject: [PATCH 1/1] Appease clippy more --- src/main.rs | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main.rs b/src/main.rs index ef09e31..fcb16c7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,9 +51,9 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { } } -fn tally_votes(dir: PathBuf) -> std::io::Result>> { +fn tally_votes(dir: &Path) -> std::io::Result>> { let mut tally: HashMap> = HashMap::new(); - if let Ok(vfile) = std::fs::File::open(dir.join("votes")) { + if let Ok(vfile) = std::fs::File::open(dir.to_owned().join("votes")) { for liner in std::io::BufReader::new(vfile).lines() { let line = liner?; if let Some((voter, datum)) = line.split_once(' ') { @@ -77,15 +77,15 @@ fn tally_votes(dir: PathBuf) -> std::io::Result> Ok(tally) } -fn valid_id_char(c: &u8) -> bool { - (b'A'..=b'Z').contains(c) || (b'a'..=b'z').contains(c) || (b'0'..=b'9').contains(c) +fn valid_id_char(c: u8) -> bool { + (b'A'..=b'Z').contains(&c) || (b'a'..=b'z').contains(&c) || (b'0'..=b'9').contains(&c) } fn make_random_id() -> [u8; COOKIE_LENGTH] { let mut id = [0; COOKIE_LENGTH]; for c in &mut id { - while !valid_id_char(c) { - *c = random() + while !valid_id_char(*c) { + *c = random(); } } id @@ -195,15 +195,14 @@ fn supports(tally: &HashMap>, me: &str, candidate: &str) .map_or(false, |supporters| supporters.contains(me)) } -fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result { - let voter = get_voter(&request); +fn prompt_for_vote(dir: &Path, request: &cgi::Request) -> Result { + let voter = get_voter(request); let me = if let Ok(id) = voter { std::str::from_utf8(id).ok() } else { None }; - let tally = - tally_votes(dir.clone()).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?; + let tally = tally_votes(dir).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?; let cfile = std::fs::File::open(dir.join("candidates")) .map_err(|_| cgi::text_response(503, "No candidates"))?; let mut response = cgi::html_response( @@ -231,12 +230,12 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result std::io::Result<()> { +fn write_vote(dir: &Path, voter: &[u8], vote: &[u8]) -> std::io::Result<()> { let datum = [voter, b" ", vote, b"\n"].concat(); let vpath = dir.join("votes"); let vfile = std::fs::File::options() @@ -248,7 +247,7 @@ fn write_vote(dir: PathBuf, voter: &[u8], vote: &[u8]) -> std::io::Result<()> { Ok(()) } -fn record_vote(dir: PathBuf, request: cgi::Request) -> Result { +fn record_vote(dir: &Path, request: &cgi::Request) -> Result { let body = request.body(); // Valid votes look like "0 foo" or "1 bar" if body.len() < 3 @@ -258,7 +257,7 @@ fn record_vote(dir: PathBuf, request: cgi::Request) -> Result cgi::Response { response } -fn respond(request: cgi::Request) -> Result { +fn respond(request: &cgi::Request) -> Result { let dir = validate_path(request.uri().path())?; match *request.method() { - cgi::http::Method::HEAD => prompt_for_vote(dir, request).map(strip_body), - cgi::http::Method::GET => prompt_for_vote(dir, request), - cgi::http::Method::PUT => record_vote(dir, request), + cgi::http::Method::HEAD => prompt_for_vote(&dir, request).map(strip_body), + cgi::http::Method::GET => prompt_for_vote(&dir, request), + cgi::http::Method::PUT => record_vote(&dir, request), _ => Err(cgi::text_response(405, "Huh?")), } } fn respond_or_report_error(request: cgi::Request) -> cgi::Response { - match respond(request) { + match respond(&request) { Ok(result) => result, Err(error) => error, } -- 2.44.1