diff --git a/src/rules/paren.rs b/src/rules/paren.rs index a252b04..7971b24 100644 --- a/src/rules/paren.rs +++ b/src/rules/paren.rs @@ -38,7 +38,6 @@ pub fn rule( steps.push_back(crate::builder::Step::FormatWider(child.element)); } crate::config::Layout::Wide => { - steps.push_back(crate::builder::Step::Whitespace); steps.push_back(crate::builder::Step::Format(child.element)); } } @@ -58,9 +57,7 @@ pub fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::config::Layout::Wide => { - steps.push_back(crate::builder::Step::Whitespace); - } + crate::config::Layout::Wide => {} } steps.push_back(crate::builder::Step::Format(child.element)); diff --git a/tests/cases/apply/out b/tests/cases/apply/out index 5eb1b42..f935d03 100644 --- a/tests/cases/apply/out +++ b/tests/cases/apply/out @@ -1,5 +1,5 @@ -( a b ) - ( a b ) +(a b) + (a b) ( a /* diff --git a/tests/cases/assert/out b/tests/cases/assert/out index fdac08a..63ac9dc 100644 --- a/tests/cases/assert/out +++ b/tests/cases/assert/out @@ -1,5 +1,5 @@ [ - ( assert b; c ) + (assert b; c) ( assert b; /* @@ -26,9 +26,7 @@ */ c ) - ( - assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc - ) + (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) ( assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc diff --git a/tests/cases/bin_op/out b/tests/cases/bin_op/out index 6e8199f..6cee68f 100644 --- a/tests/cases/bin_op/out +++ b/tests/cases/bin_op/out @@ -1,5 +1,5 @@ [ - ( 1 + 1 ) + (1 + 1) ( 1 + @@ -37,7 +37,7 @@ ) ) ) - ( 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 ) + (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1) ( 1 + 1 diff --git a/tests/cases/if_else/out b/tests/cases/if_else/out index 5915e2a..5af455d 100644 --- a/tests/cases/if_else/out +++ b/tests/cases/if_else/out @@ -1,5 +1,5 @@ [ - ( if a then b else c ) + (if a then b else c) ( if /**/ @@ -19,29 +19,29 @@ if ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) then ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) else ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) ) then @@ -49,29 +49,29 @@ if ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) then ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) else ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) ) else @@ -79,29 +79,29 @@ if ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) then ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) else ( if - ( if a then b else c ) + (if a then b else c) then - ( if a then b else c ) + (if a then b else c) else - ( if a then b else c ) + (if a then b else c) ) ) ) diff --git a/tests/cases/inherit_from/out b/tests/cases/inherit_from/out index 406eecd..237d15c 100644 --- a/tests/cases/inherit_from/out +++ b/tests/cases/inherit_from/out @@ -1,8 +1,8 @@ [ - { inherit ( c ) f h; } + { inherit (c) f h; } { inherit - ( c ) + (c) f h /* @@ -12,7 +12,7 @@ } { inherit - ( c ) + (c) f /* g @@ -22,7 +22,7 @@ } { inherit - ( c ) + (c) f /* g @@ -35,7 +35,7 @@ } { inherit - ( c ) + (c) /* e */ @@ -45,7 +45,7 @@ } { inherit - ( c ) + (c) /* e */ @@ -58,7 +58,7 @@ } { inherit - ( c ) + (c) /* e */ @@ -71,7 +71,7 @@ } { inherit - ( c ) + (c) /* e */ @@ -510,7 +510,7 @@ /* a */ - ( c ) + (c) f h ; @@ -520,7 +520,7 @@ /* a */ - ( c ) + (c) f h /* @@ -533,7 +533,7 @@ /* a */ - ( c ) + (c) f /* g @@ -546,7 +546,7 @@ /* a */ - ( c ) + (c) f /* g @@ -562,7 +562,7 @@ /* a */ - ( c ) + (c) /* e */ @@ -575,7 +575,7 @@ /* a */ - ( c ) + (c) /* e */ @@ -591,7 +591,7 @@ /* a */ - ( c ) + (c) /* e */ @@ -607,7 +607,7 @@ /* a */ - ( c ) + (c) /* e */ diff --git a/tests/cases/lambda/out b/tests/cases/lambda/out index c4f28f2..275f06e 100644 --- a/tests/cases/lambda/out +++ b/tests/cases/lambda/out @@ -1,5 +1,5 @@ [ - ( a: d ) + (a: d) ( a: /* @@ -26,9 +26,7 @@ */ d ) - ( - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - ) + (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) ( aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/tests/cases/or_default/out b/tests/cases/or_default/out index d23e82f..7d3c13b 100644 --- a/tests/cases/or_default/out +++ b/tests/cases/or_default/out @@ -1,5 +1,5 @@ [ - ( a ? a ) + (a ? a) ( a ? @@ -37,7 +37,7 @@ ) ) ) - ( a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ) + (a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a ? a) ( a ? a diff --git a/tests/cases/paren/out b/tests/cases/paren/out index f1b66ca..52bec8c 100644 --- a/tests/cases/paren/out +++ b/tests/cases/paren/out @@ -1,7 +1,7 @@ ( - ( ( c ) ) + ((c)) ( - ( c ) + (c) /* e */ @@ -73,13 +73,13 @@ /* a */ - ( c ) + (c) ) ( /* a */ - ( c ) + (c) /* e */ diff --git a/tests/cases/pat_bind/out b/tests/cases/pat_bind/out index 59c9ee6..344cf31 100644 --- a/tests/cases/pat_bind/out +++ b/tests/cases/pat_bind/out @@ -1,5 +1,5 @@ [ - ( { } @ a: _ ) + ({ } @ a: _) ( { } @@ -24,7 +24,7 @@ a: _ ) - ( a @ { }: _ ) + (a @ { }: _) ( a @ /**/ diff --git a/tests/cases/pattern/out b/tests/cases/pattern/out index 3849e33..e701f07 100644 --- a/tests/cases/pattern/out +++ b/tests/cases/pattern/out @@ -1,11 +1,11 @@ [ - ( { }: _ ) + ({ }: _) ( { /**/ }: _ ) - ( { ... }: _ ) + ({ ... }: _) ( { ... /**/ @@ -25,7 +25,7 @@ }: _ ) - ( { b, e, ... }: _ ) + ({ b, e, ... }: _) ( { b , e @@ -1043,7 +1043,7 @@ }: _ ) - ( { a ? null }: _ ) + ({ a ? null }: _) ( { /* a diff --git a/tests/cases/select/out b/tests/cases/select/out index 46e263b..1fb036e 100644 --- a/tests/cases/select/out +++ b/tests/cases/select/out @@ -1,5 +1,5 @@ [ - ( a.a ) + (a.a) ( a . @@ -18,9 +18,7 @@ /**/ a ) - ( - a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a - ) + (a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a) ( a .a diff --git a/tests/cases/with/out b/tests/cases/with/out index 106309e..6c3a2b2 100644 --- a/tests/cases/with/out +++ b/tests/cases/with/out @@ -1,5 +1,5 @@ [ - ( with b; c ) + (with b; c) ( with b; /* @@ -26,9 +26,7 @@ */ c ) - ( - with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc - ) + (with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) ( with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc