Skip to content

Commit 52489f7

Browse files
committed
Revert "squash"
This reverts commit a09008d.
1 parent a09008d commit 52489f7

14 files changed

+6
-2772
lines changed

CHANGELOG.md

-17
Original file line numberDiff line numberDiff line change
@@ -3196,7 +3196,6 @@ Released 2018-09-13
31963196
[`ineffective_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#ineffective_bit_mask
31973197
[`inefficient_to_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#inefficient_to_string
31983198
[`infallible_destructuring_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#infallible_destructuring_match
3199-
[`infallible_destructuring_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#infallible_destructuring_match
32003199
[`infinite_iter`]: https://rust-lang.github.io/rust-clippy/master/index.html#infinite_iter
32013200
[`inherent_to_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string
32023201
[`inherent_to_string_shadow_display`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string_shadow_display
@@ -3267,28 +3266,18 @@ Released 2018-09-13
32673266
[`map_err_ignore`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_err_ignore
32683267
[`map_flatten`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_flatten
32693268
[`map_identity`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_identity
3270-
[`map_then_identity_transformer`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_then_identity_transformer
32713269
[`map_unwrap_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#map_unwrap_or
32723270
[`match_as_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_as_ref
3273-
[`match_as_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_as_ref
32743271
[`match_bool`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_bool
3275-
[`match_bool`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_bool
3276-
[`match_like_matches_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_like_matches_macro
32773272
[`match_like_matches_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_like_matches_macro
32783273
[`match_on_vec_items`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_on_vec_items
32793274
[`match_overlapping_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_overlapping_arm
3280-
[`match_overlapping_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_overlapping_arm
3281-
[`match_ref_pats`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_ref_pats
32823275
[`match_ref_pats`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_ref_pats
32833276
[`match_result_ok`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_result_ok
32843277
[`match_same_arms`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_same_arms
3285-
[`match_same_arms`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_same_arms
3286-
[`match_single_binding`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_single_binding
32873278
[`match_single_binding`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_single_binding
32883279
[`match_str_case_mismatch`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_str_case_mismatch
32893280
[`match_wild_err_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wild_err_arm
3290-
[`match_wild_err_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wild_err_arm
3291-
[`match_wildcard_for_single_variants`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wildcard_for_single_variants
32923281
[`match_wildcard_for_single_variants`]: https://rust-lang.github.io/rust-clippy/master/index.html#match_wildcard_for_single_variants
32933282
[`maybe_infinite_iter`]: https://rust-lang.github.io/rust-clippy/master/index.html#maybe_infinite_iter
32943283
[`mem_forget`]: https://rust-lang.github.io/rust-clippy/master/index.html#mem_forget
@@ -3406,7 +3395,6 @@ Released 2018-09-13
34063395
[`redundant_field_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_field_names
34073396
[`redundant_pattern`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern
34083397
[`redundant_pattern_matching`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern_matching
3409-
[`redundant_pattern_matching`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern_matching
34103398
[`redundant_pub_crate`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pub_crate
34113399
[`redundant_slicing`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_slicing
34123400
[`redundant_static_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_static_lifetimes
@@ -3416,7 +3404,6 @@ Released 2018-09-13
34163404
[`repeat_once`]: https://rust-lang.github.io/rust-clippy/master/index.html#repeat_once
34173405
[`replace_consts`]: https://rust-lang.github.io/rust-clippy/master/index.html#replace_consts
34183406
[`rest_pat_in_fully_bound_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#rest_pat_in_fully_bound_structs
3419-
[`rest_pat_in_fully_bound_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#rest_pat_in_fully_bound_structs
34203407
[`result_map_or_into_option`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_map_or_into_option
34213408
[`result_map_unit_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_map_unit_fn
34223409
[`result_unit_err`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_unit_err
@@ -3445,8 +3432,6 @@ Released 2018-09-13
34453432
[`single_component_path_imports`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_component_path_imports
34463433
[`single_element_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_element_loop
34473434
[`single_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match
3448-
[`single_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match
3449-
[`single_match_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match_else
34503435
[`single_match_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match_else
34513436
[`size_of_in_element_count`]: https://rust-lang.github.io/rust-clippy/master/index.html#size_of_in_element_count
34523437
[`skip_while_next`]: https://rust-lang.github.io/rust-clippy/master/index.html#skip_while_next
@@ -3562,10 +3547,8 @@ Released 2018-09-13
35623547
[`while_let_on_iterator`]: https://rust-lang.github.io/rust-clippy/master/index.html#while_let_on_iterator
35633548
[`wildcard_dependencies`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_dependencies
35643549
[`wildcard_enum_match_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_enum_match_arm
3565-
[`wildcard_enum_match_arm`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_enum_match_arm
35663550
[`wildcard_imports`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_imports
35673551
[`wildcard_in_or_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_in_or_patterns
3568-
[`wildcard_in_or_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#wildcard_in_or_patterns
35693552
[`write_literal`]: https://rust-lang.github.io/rust-clippy/master/index.html#write_literal
35703553
[`write_with_newline`]: https://rust-lang.github.io/rust-clippy/master/index.html#write_with_newline
35713554
[`writeln_empty_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#writeln_empty_string

clippy_lints/src/derive.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![allow(clippy::map_then_identity_transformer)]
2-
31
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_note, span_lint_and_then};
42
use clippy_utils::paths;
53
use clippy_utils::ty::{implements_trait, is_copy};

clippy_lints/src/lib.register_all.rs

-9
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,13 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
126126
LintId::of(match_result_ok::MATCH_RESULT_OK),
127127
LintId::of(match_str_case_mismatch::MATCH_STR_CASE_MISMATCH),
128128
LintId::of(matches::INFALLIBLE_DESTRUCTURING_MATCH),
129-
LintId::of(matches::INFALLIBLE_DESTRUCTURING_MATCH),
130-
LintId::of(matches::MATCH_AS_REF),
131129
LintId::of(matches::MATCH_AS_REF),
132130
LintId::of(matches::MATCH_LIKE_MATCHES_MACRO),
133-
LintId::of(matches::MATCH_LIKE_MATCHES_MACRO),
134131
LintId::of(matches::MATCH_OVERLAPPING_ARM),
135-
LintId::of(matches::MATCH_OVERLAPPING_ARM),
136-
LintId::of(matches::MATCH_REF_PATS),
137132
LintId::of(matches::MATCH_REF_PATS),
138133
LintId::of(matches::MATCH_SINGLE_BINDING),
139-
LintId::of(matches::MATCH_SINGLE_BINDING),
140-
LintId::of(matches::REDUNDANT_PATTERN_MATCHING),
141134
LintId::of(matches::REDUNDANT_PATTERN_MATCHING),
142135
LintId::of(matches::SINGLE_MATCH),
143-
LintId::of(matches::SINGLE_MATCH),
144-
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),
145136
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),
146137
LintId::of(mem_replace::MEM_REPLACE_OPTION_WITH_NONE),
147138
LintId::of(mem_replace::MEM_REPLACE_WITH_DEFAULT),

clippy_lints/src/lib.register_complexity.rs

-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ store.register_group(true, "clippy::complexity", Some("clippy_complexity"), vec!
2929
LintId::of(map_unit_fn::OPTION_MAP_UNIT_FN),
3030
LintId::of(map_unit_fn::RESULT_MAP_UNIT_FN),
3131
LintId::of(matches::MATCH_AS_REF),
32-
LintId::of(matches::MATCH_AS_REF),
33-
LintId::of(matches::MATCH_SINGLE_BINDING),
3432
LintId::of(matches::MATCH_SINGLE_BINDING),
3533
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),
36-
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),
3734
LintId::of(methods::BIND_INSTEAD_OF_MAP),
3835
LintId::of(methods::CLONE_ON_COPY),
3936
LintId::of(methods::FILTER_MAP_IDENTITY),

clippy_lints/src/lib.register_lints.rs

-17
Original file line numberDiff line numberDiff line change
@@ -241,36 +241,20 @@ store.register_lints(&[
241241
match_result_ok::MATCH_RESULT_OK,
242242
match_str_case_mismatch::MATCH_STR_CASE_MISMATCH,
243243
matches::INFALLIBLE_DESTRUCTURING_MATCH,
244-
matches::INFALLIBLE_DESTRUCTURING_MATCH,
245-
matches::MATCH_AS_REF,
246244
matches::MATCH_AS_REF,
247245
matches::MATCH_BOOL,
248-
matches::MATCH_BOOL,
249-
matches::MATCH_LIKE_MATCHES_MACRO,
250246
matches::MATCH_LIKE_MATCHES_MACRO,
251247
matches::MATCH_OVERLAPPING_ARM,
252-
matches::MATCH_OVERLAPPING_ARM,
253-
matches::MATCH_REF_PATS,
254248
matches::MATCH_REF_PATS,
255249
matches::MATCH_SAME_ARMS,
256-
matches::MATCH_SAME_ARMS,
257-
matches::MATCH_SINGLE_BINDING,
258250
matches::MATCH_SINGLE_BINDING,
259251
matches::MATCH_WILDCARD_FOR_SINGLE_VARIANTS,
260-
matches::MATCH_WILDCARD_FOR_SINGLE_VARIANTS,
261-
matches::MATCH_WILD_ERR_ARM,
262252
matches::MATCH_WILD_ERR_ARM,
263253
matches::REDUNDANT_PATTERN_MATCHING,
264-
matches::REDUNDANT_PATTERN_MATCHING,
265-
matches::REST_PAT_IN_FULLY_BOUND_STRUCTS,
266254
matches::REST_PAT_IN_FULLY_BOUND_STRUCTS,
267255
matches::SINGLE_MATCH,
268-
matches::SINGLE_MATCH,
269-
matches::SINGLE_MATCH_ELSE,
270256
matches::SINGLE_MATCH_ELSE,
271257
matches::WILDCARD_ENUM_MATCH_ARM,
272-
matches::WILDCARD_ENUM_MATCH_ARM,
273-
matches::WILDCARD_IN_OR_PATTERNS,
274258
matches::WILDCARD_IN_OR_PATTERNS,
275259
mem_forget::MEM_FORGET,
276260
mem_replace::MEM_REPLACE_OPTION_WITH_NONE,
@@ -315,7 +299,6 @@ store.register_lints(&[
315299
methods::MAP_COLLECT_RESULT_UNIT,
316300
methods::MAP_FLATTEN,
317301
methods::MAP_IDENTITY,
318-
methods::MAP_THEN_IDENTITY_TRANSFORMER,
319302
methods::MAP_UNWRAP_OR,
320303
methods::NEEDLESS_SPLITN,
321304
methods::NEW_RET_NO_SELF,

clippy_lints/src/lib.register_pedantic.rs

-6
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,16 @@ store.register_group(true, "clippy::pedantic", Some("clippy_pedantic"), vec![
5454
LintId::of(manual_ok_or::MANUAL_OK_OR),
5555
LintId::of(match_on_vec_items::MATCH_ON_VEC_ITEMS),
5656
LintId::of(matches::MATCH_BOOL),
57-
LintId::of(matches::MATCH_BOOL),
58-
LintId::of(matches::MATCH_SAME_ARMS),
5957
LintId::of(matches::MATCH_SAME_ARMS),
6058
LintId::of(matches::MATCH_WILDCARD_FOR_SINGLE_VARIANTS),
61-
LintId::of(matches::MATCH_WILDCARD_FOR_SINGLE_VARIANTS),
6259
LintId::of(matches::MATCH_WILD_ERR_ARM),
63-
LintId::of(matches::MATCH_WILD_ERR_ARM),
64-
LintId::of(matches::SINGLE_MATCH_ELSE),
6560
LintId::of(matches::SINGLE_MATCH_ELSE),
6661
LintId::of(methods::CLONED_INSTEAD_OF_COPIED),
6762
LintId::of(methods::FILTER_MAP_NEXT),
6863
LintId::of(methods::FLAT_MAP_OPTION),
6964
LintId::of(methods::FROM_ITER_INSTEAD_OF_COLLECT),
7065
LintId::of(methods::IMPLICIT_CLONE),
7166
LintId::of(methods::INEFFICIENT_TO_STRING),
72-
LintId::of(methods::MAP_THEN_IDENTITY_TRANSFORMER),
7367
LintId::of(methods::MAP_UNWRAP_OR),
7468
LintId::of(misc::FLOAT_CMP),
7569
LintId::of(misc::USED_UNDERSCORE_BINDING),

clippy_lints/src/lib.register_restriction.rs

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ store.register_group(true, "clippy::restriction", Some("clippy_restriction"), ve
2828
LintId::of(literal_representation::DECIMAL_LITERAL_REPRESENTATION),
2929
LintId::of(map_err_ignore::MAP_ERR_IGNORE),
3030
LintId::of(matches::REST_PAT_IN_FULLY_BOUND_STRUCTS),
31-
LintId::of(matches::REST_PAT_IN_FULLY_BOUND_STRUCTS),
32-
LintId::of(matches::WILDCARD_ENUM_MATCH_ARM),
3331
LintId::of(matches::WILDCARD_ENUM_MATCH_ARM),
3432
LintId::of(mem_forget::MEM_FORGET),
3533
LintId::of(methods::CLONE_ON_REF_PTR),

clippy_lints/src/lib.register_style.rs

-6
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,11 @@ store.register_group(true, "clippy::style", Some("clippy_style"), vec![
4949
LintId::of(map_clone::MAP_CLONE),
5050
LintId::of(match_result_ok::MATCH_RESULT_OK),
5151
LintId::of(matches::INFALLIBLE_DESTRUCTURING_MATCH),
52-
LintId::of(matches::INFALLIBLE_DESTRUCTURING_MATCH),
53-
LintId::of(matches::MATCH_LIKE_MATCHES_MACRO),
5452
LintId::of(matches::MATCH_LIKE_MATCHES_MACRO),
5553
LintId::of(matches::MATCH_OVERLAPPING_ARM),
56-
LintId::of(matches::MATCH_OVERLAPPING_ARM),
5754
LintId::of(matches::MATCH_REF_PATS),
58-
LintId::of(matches::MATCH_REF_PATS),
59-
LintId::of(matches::REDUNDANT_PATTERN_MATCHING),
6055
LintId::of(matches::REDUNDANT_PATTERN_MATCHING),
6156
LintId::of(matches::SINGLE_MATCH),
62-
LintId::of(matches::SINGLE_MATCH),
6357
LintId::of(mem_replace::MEM_REPLACE_OPTION_WITH_NONE),
6458
LintId::of(mem_replace::MEM_REPLACE_WITH_DEFAULT),
6559
LintId::of(methods::BYTES_NTH),

clippy_lints/src/loops/manual_memcpy.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![allow(clippy::map_then_identity_transformer)]
2-
31
use super::{IncrementVisitor, InitializeVisitor, MANUAL_MEMCPY};
42
use clippy_utils::diagnostics::span_lint_and_sugg;
53
use clippy_utils::source::snippet;

0 commit comments

Comments
 (0)