diff options
| author | bors <bors@rust-lang.org> | 2019-02-28 10:09:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-28 10:09:00 +0000 |
| commit | f69ec96906d300132ffd33151bf6641b950db96d (patch) | |
| tree | 68e2406996e2a6b7cda11f4c5347eab5a661614a | |
| parent | ff2798840cbad2ddfaad24dde4b0fa434a48826c (diff) | |
| parent | 6e6e39b4a8f4c299520e8c2436a463d9c3c6f3ce (diff) | |
| download | rust-f69ec96906d300132ffd33151bf6641b950db96d.tar.gz rust-f69ec96906d300132ffd33151bf6641b950db96d.zip | |
Auto merge of #3829 - mikerite:fix-double-parens-suggestions, r=flip1995
Add `rustfmt::skip` to `double_parens` tests
| -rwxr-xr-x | ci/base-tests.sh | 2 | ||||
| -rw-r--r-- | tests/ui/double_parens.rs | 3 | ||||
| -rw-r--r-- | tests/ui/double_parens.stderr | 12 |
3 files changed, 10 insertions, 7 deletions
diff --git a/ci/base-tests.sh b/ci/base-tests.sh index 37754972b87..d2b959a2d9d 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -59,7 +59,7 @@ rustup override set nightly # avoid loop spam and allow cmds with exit status != 0 set +ex -for file in `find tests -not -path "tests/ui/double_parens.rs" -not -path "tests/ui/doc.rs" -not -path "tests/ui/unused_unit.rs" | grep "\.rs$"` ; do +for file in `find tests -not -path "tests/ui/doc.rs" -not -path "tests/ui/unused_unit.rs" | grep "\.rs$"` ; do rustfmt ${file} --check if [ $? -ne 0 ]; then echo "${file} needs reformatting!" diff --git a/tests/ui/double_parens.rs b/tests/ui/double_parens.rs index c6f9bf77e12..9c7590c7dd6 100644 --- a/tests/ui/double_parens.rs +++ b/tests/ui/double_parens.rs @@ -1,5 +1,8 @@ #![warn(clippy::double_parens)] #![allow(dead_code)] +#![feature(custom_inner_attributes)] +#![rustfmt::skip] + fn dummy_fn<T>(_: T) {} struct DummyStruct; diff --git a/tests/ui/double_parens.stderr b/tests/ui/double_parens.stderr index 6336b1c259a..0e4c9b5682d 100644 --- a/tests/ui/double_parens.stderr +++ b/tests/ui/double_parens.stderr @@ -1,5 +1,5 @@ error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:12:5 + --> $DIR/double_parens.rs:15:5 | LL | ((0)) | ^^^^^ @@ -7,31 +7,31 @@ LL | ((0)) = note: `-D clippy::double-parens` implied by `-D warnings` error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:16:14 + --> $DIR/double_parens.rs:19:14 | LL | dummy_fn((0)); | ^^^ error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:20:20 + --> $DIR/double_parens.rs:23:20 | LL | x.dummy_method((0)); | ^^^ error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:24:5 + --> $DIR/double_parens.rs:27:5 | LL | ((1, 2)) | ^^^^^^^^ error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:28:5 + --> $DIR/double_parens.rs:31:5 | LL | (()) | ^^^^ error: Consider removing unnecessary double parentheses - --> $DIR/double_parens.rs:50:16 + --> $DIR/double_parens.rs:53:16 | LL | assert_eq!(((1, 2)), (1, 2), "Error"); | ^^^^^^^^ |