Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename ok_if_let to if_let_some_result

Browse source
This commit is contained in:
Yuki Okushi 2020-01-11 03:29:55 +09:00
parent 9e55424bdc
commit ae872fe1c7
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
clippy_lints/src/ok_if_let.rs → clippy_lints/src/if_let_some_result.rs
View file

10
clippy_lints/src/lib.rs
View file

@ -210,6 +210,7 @@ pub mod functions;
pub mod get_last_with_len; pub mod get_last_with_len;
pub mod identity_conversion; pub mod identity_conversion;
pub mod identity_op; pub mod identity_op;
pub mod if_let_some_result;
pub mod if_not_else; pub mod if_not_else;
pub mod implicit_return; pub mod implicit_return;
pub mod indexing_slicing; pub mod indexing_slicing;
@ -263,7 +264,6 @@ pub mod new_without_default;
pub mod no_effect; pub mod no_effect;
pub mod non_copy_const; pub mod non_copy_const;
pub mod non_expressive_names; pub mod non_expressive_names;
pub mod ok_if_let;
pub mod open_options; pub mod open_options;
pub mod overflow_check_conditional; pub mod overflow_check_conditional;
pub mod panic_unimplemented; pub mod panic_unimplemented;
@ -703,7 +703,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS, &non_expressive_names::JUST_UNDERSCORES_AND_DIGITS,
&non_expressive_names::MANY_SINGLE_CHAR_NAMES, &non_expressive_names::MANY_SINGLE_CHAR_NAMES,
&non_expressive_names::SIMILAR_NAMES, &non_expressive_names::SIMILAR_NAMES,
&ok_if_let::IF_LET_SOME_RESULT, &if_let_some_result::IF_LET_SOME_RESULT,
&open_options::NONSENSICAL_OPEN_OPTIONS, &open_options::NONSENSICAL_OPEN_OPTIONS,
&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL, &overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL,
&panic_unimplemented::PANIC, &panic_unimplemented::PANIC,
@ -904,7 +904,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
store.register_late_pass(|| box eval_order_dependence::EvalOrderDependence); store.register_late_pass(|| box eval_order_dependence::EvalOrderDependence);
store.register_late_pass(|| box missing_doc::MissingDoc::new()); store.register_late_pass(|| box missing_doc::MissingDoc::new());
store.register_late_pass(|| box missing_inline::MissingInline); store.register_late_pass(|| box missing_inline::MissingInline);
store.register_late_pass(|| box ok_if_let::OkIfLet); store.register_late_pass(|| box if_let_some_result::OkIfLet);
store.register_late_pass(|| box redundant_pattern_matching::RedundantPatternMatching); store.register_late_pass(|| box redundant_pattern_matching::RedundantPatternMatching);
store.register_late_pass(|| box partialeq_ne_impl::PartialEqNeImpl); store.register_late_pass(|| box partialeq_ne_impl::PartialEqNeImpl);
store.register_late_pass(|| box unused_io_amount::UnusedIoAmount); store.register_late_pass(|| box unused_io_amount::UnusedIoAmount);
@ -1265,7 +1265,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(&non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST), LintId::of(&non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST),
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS), LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES), LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
LintId::of(&ok_if_let::IF_LET_SOME_RESULT), LintId::of(&if_let_some_result::IF_LET_SOME_RESULT),
LintId::of(&open_options::NONSENSICAL_OPEN_OPTIONS), LintId::of(&open_options::NONSENSICAL_OPEN_OPTIONS),
LintId::of(&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL), LintId::of(&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL),
LintId::of(&panic_unimplemented::PANIC_PARAMS), LintId::of(&panic_unimplemented::PANIC_PARAMS),
@ -1413,7 +1413,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(&new_without_default::NEW_WITHOUT_DEFAULT), LintId::of(&new_without_default::NEW_WITHOUT_DEFAULT),
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS), LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES), LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
LintId::of(&ok_if_let::IF_LET_SOME_RESULT), LintId::of(&if_let_some_result::IF_LET_SOME_RESULT),
LintId::of(&panic_unimplemented::PANIC_PARAMS), LintId::of(&panic_unimplemented::PANIC_PARAMS),
LintId::of(&ptr::CMP_NULL), LintId::of(&ptr::CMP_NULL),
LintId::of(&ptr::PTR_ARG), LintId::of(&ptr::PTR_ARG),

2
src/lintlist/mod.rs
View file

@ -705,7 +705,7 @@ pub const ALL_LINTS: [Lint; 347] = [
group: "style", group: "style",
desc: "usage of `ok()` in `if let Some(pat)` statements is unnecessary, match on `Ok(pat)` instead", desc: "usage of `ok()` in `if let Some(pat)` statements is unnecessary, match on `Ok(pat)` instead",
deprecation: None, deprecation: None,
module: "ok_if_let", module: "if_let_some_result",
}, },
Lint { Lint {
name: "if_not_else", name: "if_not_else",

0
tests/ui/ok_if_let.fixed → tests/ui/if_let_some_result.fixed
View file

0
tests/ui/ok_if_let.rs → tests/ui/if_let_some_result.rs
View file

4
tests/ui/ok_if_let.stderr → tests/ui/if_let_some_result.stderr
View file

@ -1,5 +1,5 @@
error: Matching on `Some` with `ok()` is redundant error: Matching on `Some` with `ok()` is redundant
--> $DIR/ok_if_let.rs:6:5 --> $DIR/if_let_some_result.rs:6:5
| |
LL | / if let Some(y) = x.parse().ok() { LL | / if let Some(y) = x.parse().ok() {
LL | | y LL | | y
@ -19,7 +19,7 @@ LL | }
| |
error: Matching on `Some` with `ok()` is redundant error: Matching on `Some` with `ok()` is redundant
--> $DIR/ok_if_let.rs:23:9 --> $DIR/if_let_some_result.rs:23:9
| |
LL | / if let Some(y) = x.parse().ok() { LL | / if let Some(y) = x.parse().ok() {
LL | | return y; LL | | return y;