From ab9435a6d4334181c09bd56d55cfdb58b175f606 Mon Sep 17 00:00:00 2001 From: Kit Freddura Date: Sun, 2 Oct 2016 13:42:11 -0700 Subject: [PATCH] ran update --- CHANGELOG.md | 1 + README.md | 3 ++- clippy_lints/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cca4245bfa7..4ad00aafcc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -244,6 +244,7 @@ All notable changes to this project will be documented in this file. [`for_loop_over_option`]: https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_option [`for_loop_over_result`]: https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_result [`identity_op`]: https://github.com/Manishearth/rust-clippy/wiki#identity_op +[`if_let_some_result`]: https://github.com/Manishearth/rust-clippy/wiki#if_let_some_result [`if_not_else`]: https://github.com/Manishearth/rust-clippy/wiki#if_not_else [`if_same_then_else`]: https://github.com/Manishearth/rust-clippy/wiki#if_same_then_else [`ifs_same_cond`]: https://github.com/Manishearth/rust-clippy/wiki#ifs_same_cond diff --git a/README.md b/README.md index 7d6ed96681a..372f7c633f8 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ You can check out this great service at [clippy.bashy.io](https://clippy.bashy.i ## Lints -There are 172 lints included in this crate: +There are 173 lints included in this crate: name | default | triggers on ---------------------------------------------------------------------------------------------------------------------|---------|---------------------------------------------------------------------------------------------------------------------------------- @@ -231,6 +231,7 @@ name [for_loop_over_option](https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_option) | warn | for-looping over an `Option`, which is more clearly expressed as an `if let` [for_loop_over_result](https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_result) | warn | for-looping over a `Result`, which is more clearly expressed as an `if let` [identity_op](https://github.com/Manishearth/rust-clippy/wiki#identity_op) | warn | using identity operations, e.g. `x + 0` or `y / 1` +[if_let_some_result](https://github.com/Manishearth/rust-clippy/wiki#if_let_some_result) | warn | usage of `ok()` in `if let Some(x)` statements is unnecessary, match on `Ok(expr)` instead [if_not_else](https://github.com/Manishearth/rust-clippy/wiki#if_not_else) | allow | `if` branches that could be swapped so no negation operation is necessary on the condition [if_same_then_else](https://github.com/Manishearth/rust-clippy/wiki#if_same_then_else) | warn | if with the same *then* and *else* blocks [ifs_same_cond](https://github.com/Manishearth/rust-clippy/wiki#ifs_same_cond) | warn | consecutive `ifs` with the same condition diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 4fe9f0b25be..12cf1a68568 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -406,8 +406,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) { no_effect::NO_EFFECT, no_effect::UNNECESSARY_OPERATION, non_expressive_names::MANY_SINGLE_CHAR_NAMES, - open_options::NONSENSICAL_OPEN_OPTIONS, ok_if_let::IF_LET_SOME_RESULT, + open_options::NONSENSICAL_OPEN_OPTIONS, overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL, panic::PANIC_PARAMS, precedence::PRECEDENCE, -- 2.44.0