Skip to content

Commit b2c88b0

Browse files
committed
Merge remote-tracking branch 'origin/master' into rustup
2 parents 32a9394 + 916f2f9 commit b2c88b0

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

clippy_lints/src/approx_const.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ use utils::span_lint;
77

88
/// **What it does:** Checks for floating point literals that approximate
99
/// constants which are defined in
10-
/// [`std::f32::consts`](https://doc.rust-lang.
11-
/// org/stable/std/f32/consts/#constants)
10+
/// [`std::f32::consts`](https://doc.rust-lang.org/stable/std/f32/consts/#constants)
1211
/// or
13-
/// [`std::f64::consts`](https://doc.rust-lang.
14-
/// org/stable/std/f64/consts/#constants),
12+
/// [`std::f64::consts`](https://doc.rust-lang.org/stable/std/f64/consts/#constants),
1513
/// respectively, suggesting to use the predefined constant.
1614
///
1715
/// **Why is this bad?** Usually, the definition in the standard library is more

clippy_lints/src/is_unit_expr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use utils::span_note_and_lint;
1818
/// **Example:**
1919
/// * `let x = {"foo" ;}` when the user almost certainly intended `let x
2020
/// ={"foo"}`
21-
2221
declare_lint! {
2322
pub UNIT_EXPR,
2423
Warn,

clippy_lints/src/regex.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ declare_lint! {
3030
"invalid regular expressions"
3131
}
3232

33-
/// **What it does:** Checks for trivial [regex] creation (with `Regex::new`,
34-
/// `RegexBuilder::new` or `RegexSet::new`).
35-
///
36-
/// [regex]: https://crates.io/crates/regex
33+
/// **What it does:** Checks for trivial [regex](https://crates.io/crates/regex)
34+
/// creation (with `Regex::new`, `RegexBuilder::new` or `RegexSet::new`).
3735
///
3836
/// **Why is this bad?** Matching the regex can likely be replaced by `==` or
3937
/// `str::starts_with`, `str::ends_with` or `std::contains` or other `str`

0 commit comments

Comments
 (0)