From 8133330850750d4f3382ddc3b645642eae3ea08f Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 1 Jan 2023 01:20:26 -0800 Subject: [PATCH 1/1] Appease clippy --- src/main.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index f79d353..2e5de54 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,7 @@ fn validate_path(path: &str) -> Result { if path == "/" { return Err(cgi::text_response(404, "(This is the voting place. You should have been given a more specific URL for the specific thing you've been invited to vote on.)")); } - if path.contains("..") || !path.starts_with("/") { + if path.contains("..") || !path.starts_with('/') { return Err(invalid_path()); } let dir = Path::new(&format!("{DATA_PATH}{path}")).to_path_buf(); @@ -77,14 +77,16 @@ 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 make_random_id() -> [u8; COOKIE_LENGTH] { let mut id = [0; COOKIE_LENGTH]; - for i in 0..COOKIE_LENGTH { - while !(b'A'..=b'Z').contains(&id[i]) - && !(b'a'..=b'z').contains(&id[i]) - && !(b'0'..=b'9').contains(&id[i]) + for c in id.iter_mut() { + while !valid_id_char(c) { - id[i] = random() + *c = random() } } id @@ -247,7 +249,7 @@ fn write_vote(dir: PathBuf, voter: &[u8], vote: &[u8]) -> std::io::Result<()> { .create(true) .open(vpath)?; let mut vlock = fd_lock::RwLock::new(vfile); - vlock.write()?.write(&datum)?; + vlock.write()?.write_all(&datum)?; Ok(()) } @@ -261,7 +263,7 @@ fn record_vote(dir: PathBuf, request: cgi::Request) -> Result cgi::Response { 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), + 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), _ => Err(cgi::text_response(405, "Huh?")), } } -- 2.44.1