Skip to content

Commit

Permalink
Auto merge of rust-lang#71139 - matthiaskrgr:submodule_upd, r=Dylan-DPC
Browse files Browse the repository at this point in the history
submodules: update clippy from af5940b to d236b30

Changes:
````
rustup rust-lang#70643
Explain panic on `E0463` in integration tests
Temporarily disable rustfmt integration test
Cleanup: Use rustc's is_proc_macro_attr
Cleanup: Use our `sym!` macro more
Fixes rust-lang#5405: redundant clone false positive with arrays
update lints
verbose_bit_mask: fix bit mask used in docs
Update documentation for new_ret_no_self
````

Fixes rust-lang#71114
  • Loading branch information
bors committed Apr 15, 2020
2 parents 835428c + fada4b2 commit d223029
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
26 changes: 24 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ dependencies = [
"cargo_metadata 0.9.1",
"clippy-mini-macro-test",
"clippy_lints",
"compiletest_rs",
"compiletest_rs 0.5.0",
"derive-new",
"lazy_static 1.4.0",
"regex",
Expand Down Expand Up @@ -614,6 +614,28 @@ dependencies = [
"winapi 0.3.8",
]

[[package]]
name = "compiletest_rs"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f737835bfbbe29ed1ff82d5137520338d7ed5bf1a1d4b9c1c7c58bb45b8fa29"
dependencies = [
"diff",
"filetime",
"getopts",
"libc",
"log",
"miow 0.3.3",
"regex",
"rustfix 0.5.0",
"serde",
"serde_derive",
"serde_json",
"tempfile",
"tester",
"winapi 0.3.8",
]

[[package]]
name = "constant_time_eq"
version = "0.1.3"
Expand Down Expand Up @@ -2168,7 +2190,7 @@ dependencies = [
"byteorder",
"cargo_metadata 0.9.1",
"colored",
"compiletest_rs",
"compiletest_rs 0.4.0",
"directories",
"env_logger 0.7.1",
"getrandom",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy
Submodule clippy updated 64 files
+2 −1 .github/workflows/clippy_bors.yml
+2 −0 CHANGELOG.md
+1 −1 Cargo.toml
+11 −7 clippy_lints/src/arithmetic.rs
+1 −1 clippy_lints/src/bit_mask.rs
+4 −2 clippy_lints/src/booleans.rs
+2 −2 clippy_lints/src/cognitive_complexity.rs
+61 −0 clippy_lints/src/consts.rs
+113 −0 clippy_lints/src/dereference.rs
+3 −3 clippy_lints/src/doc.rs
+8 −11 clippy_lints/src/fallible_impl_from.rs
+3 −4 clippy_lints/src/get_last_with_len.rs
+3 −3 clippy_lints/src/if_let_some_result.rs
+85 −0 clippy_lints/src/large_const_arrays.rs
+19 −6 clippy_lints/src/large_enum_variant.rs
+5 −5 clippy_lints/src/len_zero.rs
+9 −0 clippy_lints/src/lib.rs
+6 −6 clippy_lints/src/loops.rs
+2 −2 clippy_lints/src/map_clone.rs
+3 −4 clippy_lints/src/map_unit_fn.rs
+5 −5 clippy_lints/src/matches.rs
+3 −2 clippy_lints/src/mem_replace.rs
+45 −26 clippy_lints/src/methods/mod.rs
+3 −3 clippy_lints/src/methods/option_map_unwrap_or.rs
+59 −17 clippy_lints/src/misc.rs
+2 −2 clippy_lints/src/needless_pass_by_value.rs
+1 −1 clippy_lints/src/new_without_default.rs
+1 −1 clippy_lints/src/non_expressive_names.rs
+2 −2 clippy_lints/src/ptr.rs
+4 −4 clippy_lints/src/question_mark.rs
+6 −1 clippy_lints/src/redundant_clone.rs
+1 −2 clippy_lints/src/swap.rs
+3 −3 clippy_lints/src/types.rs
+1 −1 clippy_lints/src/unused_self.rs
+2 −2 clippy_lints/src/unwrap.rs
+1 −1 clippy_lints/src/use_self.rs
+2 −8 clippy_lints/src/utils/attrs.rs
+2 −1 clippy_lints/src/utils/author.rs
+2 −2 clippy_lints/src/utils/conf.rs
+4 −2 clippy_lints/src/utils/mod.rs
+3 −3 clippy_lints/src/utils/paths.rs
+16 −2 src/lintlist/mod.rs
+3 −0 tests/integration.rs
+1 −0 tests/ui-toml/zero_single_char_names/clippy.toml
+3 −0 tests/ui-toml/zero_single_char_names/zero_single_char_names.rs
+93 −0 tests/ui/dereference.fixed
+93 −0 tests/ui/dereference.rs
+70 −0 tests/ui/dereference.stderr
+22 −1 tests/ui/float_cmp.rs
+30 −18 tests/ui/float_cmp.stderr
+13 −0 tests/ui/float_cmp_const.rs
+15 −35 tests/ui/float_cmp_const.stderr
+4 −6 tests/ui/integer_arithmetic.rs
+32 −8 tests/ui/integer_arithmetic.stderr
+37 −0 tests/ui/large_const_arrays.fixed
+37 −0 tests/ui/large_const_arrays.rs
+76 −0 tests/ui/large_const_arrays.stderr
+24 −4 tests/ui/large_enum_variant.stderr
+10 −0 tests/ui/redundant_clone.fixed
+10 −0 tests/ui/redundant_clone.rs
+10 −10 tests/ui/redundant_clone.stderr
+6 −0 tests/ui/result_map_unit_fn_unfixable.rs
+46 −15 tests/ui/result_map_unit_fn_unfixable.stderr
+4 −4 util/lintlib.py

0 comments on commit d223029

Please sign in to comment.