Minor fixes.

README.md

@@ -9,11 +9,6 @@ words.
 before running it for the first time, you must generate one.  See [here](tools/gen-words/README.md)
 for more details.
 
-Fair warning — at the time of writing this readme, ***the wordlist IS NOT
-censored***.  I have plans to allow blacklisting words, but I have not gotten
-there yet, so if you want to run the game as it currently is, play at your own
-risk.
-
 ## Controls
 
 Aside from basic text-editing controls for the word box, the following is a list

src/main.rs

@@ -43,7 +43,7 @@ fn main() {
 
   let mut len: Option<usize> = None;
 
-  loop {
+  'main: loop {
     let key;
     let set = {
       let mut keys = loop {
@@ -93,7 +93,7 @@ fn main() {
       use std::collections::hash_map::Entry::*;
 
       let mut table = markov::analyze_corpus(
-        set.iter().map(|s| ((s.len() as f64).powf(1.5), s.chars())),
+        set.iter().map(|s| ((s.len() as f64).powf(3.4), s.chars())),
       );
       let chars: HashSet<_> = set.iter().flat_map(|s| s.chars()).collect();
 
@@ -214,11 +214,7 @@ fn main() {
       // TODO: handle modifier keys better
       // TODO: up and down should be history controls, not text editing controls
       match nc::wgetch(win) {
-        0x04 => {
-          // EOT
-          nc::endwin(); // TODO: break out of the outer loop instead
-          return;
-        }
+        0x04 => break 'main,
         0x09 => word_box.borrow_mut().shuffle(&markov), // HT
         0x17 => word_box.borrow_mut().clear(),          // ETB (ctrl+bksp)
         0x1B => {
@@ -246,11 +242,7 @@ fn main() {
           word_box.borrow_mut().render_cur();
 
           match nc::wgetch(win) {
-            0x04 => {
-              // EOT
-              nc::endwin(); // TODO: break out of the outer loop instead
-              return;
-            }
+            0x04 => break 'main,
             _ => {}
           }
 
@@ -350,4 +342,6 @@ fn main() {
 
     nc::endwin();
   }
+
+  nc::endwin();
 }

tools/gen-words/src/thread_pool.rs

@@ -29,7 +29,6 @@ enum WorkerMessage {
 
 use self::{SchedMessage as SM, WorkerMessage as WM};
 
-// TODO: is the 'static necessary, or can it be parameterized?
 impl<T> ThreadPool<T>
 where
   T: Send + 'static,

tools/scrape-words/src/scrape/reddit.rs

@@ -128,7 +128,7 @@ where
 
             {
               let mut listings = listings.lock().unwrap();
-              links = listings.into_iter().flat_map(|l| l.children).collect();
+              links = listings.drain(0..).flat_map(|l| l.children).collect();
             }
 
             writeln!(io::stderr(), "retrieving comments...").unwrap();