From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 19 Nov 2022 07:03:16 +0000 (-0800)
Subject: Simpler make_random_id()
X-Git-Tag: v0.2.0~13
X-Git-Url: http://git.scottworley.com/voter/commitdiff_plain/5a0934fa0c470a490122ae68fc22a15b1df603fb

Simpler make_random_id()
---

diff --git a/src/main.rs b/src/main.rs
index 994ffac..a810597 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -45,14 +45,16 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> {
 }
 
 fn make_random_id() -> [u8; COOKIE_LENGTH] {
-    std::iter::from_fn(random)
-        .filter(|c| {
-            (b'A'..=b'Z').contains(c) || (b'a'..=b'z').contains(c) || (b'0'..=b'9').contains(c)
-        })
-        .take(COOKIE_LENGTH)
-        .collect::<Vec<_>>()
-        .try_into()
-        .unwrap()
+    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])
+        {
+            id[i] = random()
+        }
+    }
+    id
 }
 
 fn set_cookie(mut response: cgi::Response, path: &str) -> Result<cgi::Response, cgi::Response> {