Refactor out loop into it's own naughty word function

sondr3 · sondr3 · commit 03e8d8186f0b · 2018-10-14T23:39:35.000+02:00
diff --git a/src/main.rs b/src/main.rs
@@ -21,8 +21,8 @@ fn main() -> Result<(), Box<std::error::Error>> {
     for curse in &curses {
         occurrences.entry(curse.to_string()).or_insert(0);
     }
-    for word in "this is a fucking shit sentence with no goddamn shite in it".split(' ') {
-        if curses.contains(&word) {
+    for word in "this is a fucking shit sentence with no goddamn shite in it".split_whitespace() {
+        if naughty_word(&word, &curses) {
             occurrences.entry(word.to_string()).and_modify(|i| *i += 1);
         }
     }
@@ -34,3 +34,10 @@ fn main() -> Result<(), Box<std::error::Error>> {
     println!("{:#?}", occurrences);
     Ok(())
 }
+
+fn naughty_word(word: &str, naughty_list: &Vec<&str>) -> bool {
+    if naughty_list.contains(&word) {
+        return true;
+    }
+    false
+}

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ fn main() -> Result<(), Box<std::error::Error>> {`
`21`	`21`	`for curse in &curses {`
`22`	`22`	`occurrences.entry(curse.to_string()).or_insert(0);`
`23`	`23`	`}`
`24`		`- for word in "this is a fucking shit sentence with no goddamn shite in it".split(' ') {`
`25`		`- if curses.contains(&word) {`
	`24`	`+ for word in "this is a fucking shit sentence with no goddamn shite in it".split_whitespace() {`
	`25`	`+ if naughty_word(&word, &curses) {`
`26`	`26`	`occurrences.entry(word.to_string()).and_modify(\|i\| *i += 1);`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -34,3 +34,10 @@ fn main() -> Result<(), Box<std::error::Error>> {`
`34`	`34`	`println!("{:#?}", occurrences);`
`35`	`35`	`Ok(())`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+fn naughty_word(word: &str, naughty_list: &Vec<&str>) -> bool {`
	`39`	`+ if naughty_list.contains(&word) {`
	`40`	`+ return true;`
	`41`	`+ }`
	`42`	`+ false`
	`43`	`+}`