Skip to content

Commit f69ec96

Browse files
committed
Auto merge of #3829 - mikerite:fix-double-parens-suggestions, r=flip1995
Add `rustfmt::skip` to `double_parens` tests
2 parents ff27988 + 6e6e39b commit f69ec96

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

ci/base-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ rustup override set nightly
5959
# avoid loop spam and allow cmds with exit status != 0
6060
set +ex
6161

62-
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
62+
for file in `find tests -not -path "tests/ui/doc.rs" -not -path "tests/ui/unused_unit.rs" | grep "\.rs$"` ; do
6363
rustfmt ${file} --check
6464
if [ $? -ne 0 ]; then
6565
echo "${file} needs reformatting!"

tests/ui/double_parens.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#![warn(clippy::double_parens)]
22
#![allow(dead_code)]
3+
#![feature(custom_inner_attributes)]
4+
#![rustfmt::skip]
5+
36
fn dummy_fn<T>(_: T) {}
47

58
struct DummyStruct;

tests/ui/double_parens.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
error: Consider removing unnecessary double parentheses
2-
--> $DIR/double_parens.rs:12:5
2+
--> $DIR/double_parens.rs:15:5
33
|
44
LL | ((0))
55
| ^^^^^
66
|
77
= note: `-D clippy::double-parens` implied by `-D warnings`
88

99
error: Consider removing unnecessary double parentheses
10-
--> $DIR/double_parens.rs:16:14
10+
--> $DIR/double_parens.rs:19:14
1111
|
1212
LL | dummy_fn((0));
1313
| ^^^
1414

1515
error: Consider removing unnecessary double parentheses
16-
--> $DIR/double_parens.rs:20:20
16+
--> $DIR/double_parens.rs:23:20
1717
|
1818
LL | x.dummy_method((0));
1919
| ^^^
2020

2121
error: Consider removing unnecessary double parentheses
22-
--> $DIR/double_parens.rs:24:5
22+
--> $DIR/double_parens.rs:27:5
2323
|
2424
LL | ((1, 2))
2525
| ^^^^^^^^
2626

2727
error: Consider removing unnecessary double parentheses
28-
--> $DIR/double_parens.rs:28:5
28+
--> $DIR/double_parens.rs:31:5
2929
|
3030
LL | (())
3131
| ^^^^
3232

3333
error: Consider removing unnecessary double parentheses
34-
--> $DIR/double_parens.rs:50:16
34+
--> $DIR/double_parens.rs:53:16
3535
|
3636
LL | assert_eq!(((1, 2)), (1, 2), "Error");
3737
| ^^^^^^^^

0 commit comments

Comments
 (0)