Skip to content

Commit d23ddab

Browse files
committed
Auto merge of rust-lang#8544 - nellorocca:dev/5757, r=flip1995
Moved ``[try_err]`` to restriction Fixes rust-lang#5757 changelog: Moved try_err lint to rescrition for rust-lang#5757
2 parents 2b0e730 + a39d649 commit d23ddab

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

clippy_lints/src/lib.register_all.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
289289
LintId::of(transmute::UNSOUND_COLLECTION_TRANSMUTE),
290290
LintId::of(transmute::WRONG_TRANSMUTE),
291291
LintId::of(transmuting_null::TRANSMUTING_NULL),
292-
LintId::of(try_err::TRY_ERR),
293292
LintId::of(types::BORROWED_BOX),
294293
LintId::of(types::BOX_COLLECTION),
295294
LintId::of(types::REDUNDANT_ALLOCATION),

clippy_lints/src/lib.register_restriction.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ store.register_group(true, "clippy::restriction", Some("clippy_restriction"), ve
6262
LintId::of(strings::STRING_SLICE),
6363
LintId::of(strings::STRING_TO_STRING),
6464
LintId::of(strings::STR_TO_STRING),
65+
LintId::of(try_err::TRY_ERR),
6566
LintId::of(types::RC_BUFFER),
6667
LintId::of(types::RC_MUTEX),
6768
LintId::of(undocumented_unsafe_blocks::UNDOCUMENTED_UNSAFE_BLOCKS),

clippy_lints/src/lib.register_style.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ store.register_group(true, "clippy::style", Some("clippy_style"), vec![
105105
LintId::of(single_component_path_imports::SINGLE_COMPONENT_PATH_IMPORTS),
106106
LintId::of(tabs_in_doc_comments::TABS_IN_DOC_COMMENTS),
107107
LintId::of(to_digit_is_some::TO_DIGIT_IS_SOME),
108-
LintId::of(try_err::TRY_ERR),
109108
LintId::of(unsafe_removed_from_name::UNSAFE_REMOVED_FROM_NAME),
110109
LintId::of(unused_unit::UNUSED_UNIT),
111110
LintId::of(upper_case_acronyms::UPPER_CASE_ACRONYMS),

clippy_lints/src/try_err.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ declare_clippy_lint! {
4343
/// ```
4444
#[clippy::version = "1.38.0"]
4545
pub TRY_ERR,
46-
style,
46+
restriction,
4747
"return errors explicitly rather than hiding them behind a `?`"
4848
}
4949

0 commit comments

Comments
 (0)