Skip to content

Commit ce5a662

Browse files
committed
submodules: update clippy from 164310d to dc69a5c
Changes: ```` ci: temporarily disable rustfmt checks/tetss since it's broken for nightly rustup rust-lang/rust#62964 Bump version of clippy_dummy update test stderr, not sure which rustc pull request caused this. rustup rust-lang/rust#62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to rust-lang/rust#60913 Fix breakage due to rust-lang/rust#62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup rust-lang/rust#62679 Update pulldown-cmark to 0.5.3 rustup rust-lang/rust#62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ````
1 parent ea2cfe0 commit ce5a662

File tree

74 files changed

+1159
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1159
-681
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
install:
2323
- |
2424
if [ -z ${INTEGRATION} ]; then
25-
rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
25+
# rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
2626
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
2727
. $HOME/.nvm/nvm.sh
2828
nvm install stable

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,8 @@ Released 2018-09-13
973973
[`ineffective_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#ineffective_bit_mask
974974
[`infallible_destructuring_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#infallible_destructuring_match
975975
[`infinite_iter`]: https://rust-lang.github.io/rust-clippy/master/index.html#infinite_iter
976+
[`inherent_to_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string
977+
[`inherent_to_string_shadow_display`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string_shadow_display
976978
[`inline_always`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_always
977979
[`inline_fn_without_body`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_fn_without_body
978980
[`int_plus_one`]: https://rust-lang.github.io/rust-clippy/master/index.html#int_plus_one

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
88

9-
[There are 306 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
9+
[There are 308 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
1010

1111
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
1212

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- del rust-toolchain
2323
- cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
2424
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
25-
- rustup component add rustfmt --toolchain nightly
25+
#- rustup component add rustfmt --toolchain nightly
2626
- rustup default master
2727
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
2828
- rustc -V

clippy_dev/src/stderr_length_check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::io::prelude::*;
77
// The maximum length allowed for stderr files.
88
//
99
// We limit this because small files are easier to deal with than bigger files.
10-
const LIMIT: usize = 320;
10+
const LIMIT: usize = 275;
1111

1212
pub fn check() {
1313
let stderr_files = stderr_files();

clippy_dummy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy_dummy" # rename to clippy before publishing
3-
version = "0.0.302"
3+
version = "0.0.303"
44
authors = ["Manish Goregaokar <manishsmail@gmail.com>"]
55
edition = "2018"
66
readme = "crates-readme.md"

clippy_dummy/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate term;
33
fn main() {
44
if let Err(_) = foo() {
55
eprintln!("error: Clippy is no longer available via crates.io\n");
6-
eprintln!("help: please run `rustup component add clippy-preview` instead");
6+
eprintln!("help: please run `rustup component add clippy` instead");
77
}
88
std::process::exit(1);
99
}
@@ -31,7 +31,7 @@ fn foo() -> Result<(), ()> {
3131
write!(t, "please run `").map_err(|_| ())?;
3232

3333
t.attr(term::Attr::Bold).map_err(|_| ())?;
34-
write!(t, "rustup component add clippy-preview").map_err(|_| ())?;
34+
write!(t, "rustup component add clippy").map_err(|_| ())?;
3535

3636
t.reset().map_err(|_| ())?;
3737
t.fg(term::color::WHITE).map_err(|_| ())?;

clippy_dummy/crates-readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Installing clippy via crates.io is deprecated. Please use the following:
22

33
```terminal
4-
rustup component add clippy-preview
4+
rustup component add clippy
55
```
66

77
on a Rust version 1.29 or later. You may need to run `rustup self update` if it complains about a missing clippy binary.

clippy_lints/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ semver = "0.9.0"
2727
serde = { version = "1.0", features = ["derive"] }
2828
toml = "0.5"
2929
unicode-normalization = "0.1"
30-
pulldown-cmark = "0.5.2"
30+
pulldown-cmark = "0.5.3"
3131
url = "1.7.0"
3232
if_chain = "1.0.0"
3333
smallvec = { version = "0.6.5", features = ["union"] }

clippy_lints/src/double_comparison.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ impl<'a, 'tcx> DoubleComparisons {
6363
);
6464
}};
6565
}
66+
#[rustfmt::skip]
6667
match (op, lkind, rkind) {
6768
(BinOpKind::Or, BinOpKind::Eq, BinOpKind::Lt) | (BinOpKind::Or, BinOpKind::Lt, BinOpKind::Eq) => {
6869
lint_double_comparison!(<=)

0 commit comments

Comments
 (0)