Merge remote-tracking branch 'origin/master' into rustup

clippy_lints/src/approx_const.rs

@@ -7,11 +7,9 @@ use utils::span_lint;
 
 /// **What it does:** Checks for floating point literals that approximate
 /// constants which are defined in
-/// [`std::f32::consts`](https://doc.rust-lang.
-/// org/stable/std/f32/consts/#constants)
+/// [`std::f32::consts`](https://doc.rust-lang.org/stable/std/f32/consts/#constants)
 /// or
-/// [`std::f64::consts`](https://doc.rust-lang.
-/// org/stable/std/f64/consts/#constants),
+/// [`std::f64::consts`](https://doc.rust-lang.org/stable/std/f64/consts/#constants),
 /// respectively, suggesting to use the predefined constant.
 ///
 /// **Why is this bad?** Usually, the definition in the standard library is more

clippy_lints/src/is_unit_expr.rs

@@ -18,7 +18,6 @@ use utils::span_note_and_lint;
 /// **Example:**
 /// * `let x = {"foo" ;}` when the user almost certainly intended `let x
 /// ={"foo"}`
-
 declare_lint! {
     pub UNIT_EXPR,
     Warn,

clippy_lints/src/regex.rs

@@ -30,10 +30,8 @@ declare_lint! {
     "invalid regular expressions"
 }
 
-/// **What it does:** Checks for trivial [regex] creation (with `Regex::new`,
-/// `RegexBuilder::new` or `RegexSet::new`).
-///
-/// [regex]: https://crates.io/crates/regex
+/// **What it does:** Checks for trivial [regex](https://crates.io/crates/regex)
+/// creation (with `Regex::new`, `RegexBuilder::new` or `RegexSet::new`).
 ///
 /// **Why is this bad?** Matching the regex can likely be replaced by `==` or
 /// `str::starts_with`, `str::ends_with` or `std::contains` or other `str`