@@ -146,9 +146,9 @@ impl TreeElement for CompoundContent {
146146 create_subs ! ( & self . lbrace, & self . statements, & self . rbrace)
147147 }
148148 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , aux : AuxParams ) {
149- rules. sp_brace . check ( acc , SpBracesArgs :: from_compound ( self ) ) ;
150- rules. indent_code_block . check ( acc , IndentCodeBlockArgs :: from_compound_content ( self , aux. depth ) ) ;
151- rules. indent_closing_brace . check ( acc , IndentClosingBraceArgs :: from_compound_content ( self , aux. depth ) ) ;
149+ rules. sp_brace . check ( SpBracesArgs :: from_compound ( self ) , acc ) ;
150+ rules. indent_code_block . check ( IndentCodeBlockArgs :: from_compound_content ( self , aux. depth ) , acc ) ;
151+ rules. indent_closing_brace . check ( IndentClosingBraceArgs :: from_compound_content ( self , aux. depth ) , acc ) ;
152152 }
153153 fn should_increment_depth ( & self ) -> bool {
154154 true
@@ -204,7 +204,7 @@ impl TreeElement for VariableDeclContent {
204204 self . decls . ensure_named ( )
205205 }
206206 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
207- rules. sp_punct . check ( acc , SpPunctArgs :: from_variable_decl ( self ) ) ;
207+ rules. sp_punct . check ( SpPunctArgs :: from_variable_decl ( self ) , acc ) ;
208208 }
209209}
210210
@@ -436,9 +436,9 @@ impl TreeElement for IfContent {
436436 & self . elsebranch)
437437 }
438438 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
439- rules. nsp_inparen . check ( acc , NspInparenArgs :: from_if ( self ) ) ;
440- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_if ( self ) ) ;
441- rules. sp_reserved . check ( acc , SpReservedArgs :: from_if ( self ) ) ;
439+ rules. nsp_inparen . check ( NspInparenArgs :: from_if ( self ) , acc ) ;
440+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_if ( self ) , acc ) ;
441+ rules. sp_reserved . check ( SpReservedArgs :: from_if ( self ) , acc ) ;
442442 }
443443}
444444
@@ -550,9 +550,9 @@ impl TreeElement for WhileContent {
550550 & self . statement)
551551 }
552552 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , aux : AuxParams ) {
553- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_while ( self ) ) ;
554- rules. indent_empty_loop . check ( acc , IndentEmptyLoopArgs :: from_while_content ( self , aux. depth ) ) ;
555- rules. sp_reserved . check ( acc , SpReservedArgs :: from_while ( self ) ) ;
553+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_while ( self ) , acc ) ;
554+ rules. indent_empty_loop . check ( IndentEmptyLoopArgs :: from_while_content ( self , aux. depth ) , acc ) ;
555+ rules. sp_reserved . check ( SpReservedArgs :: from_while ( self ) , acc ) ;
556556 }
557557}
558558
@@ -602,7 +602,7 @@ impl TreeElement for DoContent {
602602 & self . semi)
603603 }
604604 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
605- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_do_while ( self ) ) ;
605+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_do_while ( self ) , acc ) ;
606606 }
607607}
608608
@@ -867,9 +867,9 @@ impl TreeElement for ForContent {
867867 & self . statement)
868868 }
869869 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , aux : AuxParams ) {
870- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_for ( self ) ) ;
871- rules. indent_empty_loop . check ( acc , IndentEmptyLoopArgs :: from_for_content ( self , aux. depth ) ) ;
872- rules. sp_reserved . check ( acc , SpReservedArgs :: from_for ( self ) ) ;
870+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_for ( self ) , acc ) ;
871+ rules. indent_empty_loop . check ( IndentEmptyLoopArgs :: from_for_content ( self , aux. depth ) , acc ) ;
872+ rules. sp_reserved . check ( SpReservedArgs :: from_for ( self ) , acc ) ;
873873 }
874874}
875875
@@ -1028,7 +1028,7 @@ impl TreeElement for SwitchCase {
10281028 }
10291029 }
10301030 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , aux : AuxParams ) {
1031- rules. indent_switch_case . check ( acc , IndentSwitchCaseArgs :: from_switch_case ( self , aux. depth ) ) ;
1031+ rules. indent_switch_case . check ( IndentSwitchCaseArgs :: from_switch_case ( self , aux. depth ) , acc ) ;
10321032 }
10331033 fn should_increment_depth ( & self ) -> bool {
10341034 matches ! ( self , SwitchCase :: Statement ( statement)
@@ -1118,8 +1118,8 @@ impl TreeElement for SwitchContent {
11181118 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > ,
11191119 rules : & CurrentRules , aux : AuxParams )
11201120 {
1121- rules. indent_closing_brace . check ( acc , IndentClosingBraceArgs :: from_switch_content ( self , aux. depth ) ) ;
1122- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_switch ( self ) ) ;
1121+ rules. indent_closing_brace . check ( IndentClosingBraceArgs :: from_switch_content ( self , aux. depth ) , acc ) ;
1122+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_switch ( self ) , acc ) ;
11231123 }
11241124}
11251125
@@ -1290,7 +1290,7 @@ impl TreeElement for AfterContent {
12901290 & self . semi)
12911291 }
12921292 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
1293- rules. sp_reserved . check ( acc , SpReservedArgs :: from_after_content ( self ) ) ;
1293+ rules. sp_reserved . check ( SpReservedArgs :: from_after_content ( self ) , acc ) ;
12941294 }
12951295}
12961296
@@ -1618,7 +1618,7 @@ impl TreeElement for ForeachContent {
16181618 & self . statement)
16191619 }
16201620 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
1621- rules. indent_paren_expr . check ( acc , IndentParenExprArgs :: from_foreach ( self ) ) ;
1621+ rules. indent_paren_expr . check ( IndentParenExprArgs :: from_foreach ( self ) , acc ) ;
16221622 }
16231623}
16241624
@@ -1757,7 +1757,7 @@ impl TreeElement for ExpressionStmtContent {
17571757 create_subs ! ( & self . expression, & self . semi)
17581758 }
17591759 fn evaluate_rules ( & self , acc : & mut Vec < DMLStyleError > , rules : & CurrentRules , _aux : AuxParams ) {
1760- rules. sp_punct . check ( acc , SpPunctArgs :: from_expression_stmt ( self ) ) ;
1760+ rules. sp_punct . check ( SpPunctArgs :: from_expression_stmt ( self ) , acc ) ;
17611761 }
17621762}
17631763
0 commit comments