Rollup merge of rust-lang#25322 - frewsxcv:patch-23, r=steveklabnik

`if` can be a statement or also an expression.

Author: steveklabnik

src/doc/trpl/primitive-types.md

@@ -15,7 +15,7 @@ let x = true;
 let y: bool = false;
 ```
 
-A common use of booleans is in [`if` statements][if].
+A common use of booleans is in [`if` conditionals][if].
 
 [if]: if.html