Skip to content

Commit d83d6cc

Browse files
committed
Rename ok_if_let to if_let_some_result
1 parent 267b783 commit d83d6cc

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

clippy_lints/src/lib.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ pub mod functions;
211211
pub mod get_last_with_len;
212212
pub mod identity_conversion;
213213
pub mod identity_op;
214+
pub mod if_let_some_result;
214215
pub mod if_not_else;
215216
pub mod implicit_return;
216217
pub mod indexing_slicing;
@@ -264,7 +265,6 @@ pub mod new_without_default;
264265
pub mod no_effect;
265266
pub mod non_copy_const;
266267
pub mod non_expressive_names;
267-
pub mod ok_if_let;
268268
pub mod open_options;
269269
pub mod overflow_check_conditional;
270270
pub mod panic_unimplemented;
@@ -703,7 +703,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
703703
&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS,
704704
&non_expressive_names::MANY_SINGLE_CHAR_NAMES,
705705
&non_expressive_names::SIMILAR_NAMES,
706-
&ok_if_let::IF_LET_SOME_RESULT,
706+
&if_let_some_result::IF_LET_SOME_RESULT,
707707
&open_options::NONSENSICAL_OPEN_OPTIONS,
708708
&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL,
709709
&panic_unimplemented::PANIC,
@@ -904,7 +904,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
904904
store.register_late_pass(|| box eval_order_dependence::EvalOrderDependence);
905905
store.register_late_pass(|| box missing_doc::MissingDoc::new());
906906
store.register_late_pass(|| box missing_inline::MissingInline);
907-
store.register_late_pass(|| box ok_if_let::OkIfLet);
907+
store.register_late_pass(|| box if_let_some_result::OkIfLet);
908908
store.register_late_pass(|| box redundant_pattern_matching::RedundantPatternMatching);
909909
store.register_late_pass(|| box partialeq_ne_impl::PartialEqNeImpl);
910910
store.register_late_pass(|| box unused_io_amount::UnusedIoAmount);
@@ -1262,7 +1262,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
12621262
LintId::of(&non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST),
12631263
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
12641264
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
1265-
LintId::of(&ok_if_let::IF_LET_SOME_RESULT),
1265+
LintId::of(&if_let_some_result::IF_LET_SOME_RESULT),
12661266
LintId::of(&open_options::NONSENSICAL_OPEN_OPTIONS),
12671267
LintId::of(&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL),
12681268
LintId::of(&panic_unimplemented::PANIC_PARAMS),
@@ -1411,7 +1411,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
14111411
LintId::of(&new_without_default::NEW_WITHOUT_DEFAULT),
14121412
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
14131413
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
1414-
LintId::of(&ok_if_let::IF_LET_SOME_RESULT),
1414+
LintId::of(&if_let_some_result::IF_LET_SOME_RESULT),
14151415
LintId::of(&panic_unimplemented::PANIC_PARAMS),
14161416
LintId::of(&ptr::CMP_NULL),
14171417
LintId::of(&ptr::PTR_ARG),

src/lintlist/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ pub const ALL_LINTS: [Lint; 346] = [
698698
group: "style",
699699
desc: "usage of `ok()` in `if let Some(pat)` statements is unnecessary, match on `Ok(pat)` instead",
700700
deprecation: None,
701-
module: "ok_if_let",
701+
module: "if_let_some_result",
702702
},
703703
Lint {
704704
name: "if_not_else",
File renamed without changes.
File renamed without changes.

tests/ui/ok_if_let.stderr renamed to tests/ui/if_let_some_result.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: Matching on `Some` with `ok()` is redundant
2-
--> $DIR/ok_if_let.rs:6:5
2+
--> $DIR/if_let_some_result.rs:6:5
33
|
44
LL | / if let Some(y) = x.parse().ok() {
55
LL | | y
@@ -19,7 +19,7 @@ LL | }
1919
|
2020

2121
error: Matching on `Some` with `ok()` is redundant
22-
--> $DIR/ok_if_let.rs:23:9
22+
--> $DIR/if_let_some_result.rs:23:9
2323
|
2424
LL | / if let Some(y) = x.parse().ok() {
2525
LL | | return y;

0 commit comments

Comments
 (0)