@@ -1497,12 +1497,16 @@ mod tests {
14971497 right: Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 0 ) ) ) ,
14981498 } ,
14991499 then_branch: vec![ Line :: FunctionRet {
1500- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 100 ) ) ) ] ,
1500+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1501+ ConstExpression :: scalar( 100 ) ,
1502+ ) ) ] ,
15011503 } ] ,
15021504 else_branch: vec![ ] ,
15031505 } ,
15041506 Line :: FunctionRet {
1505- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 200 ) ) ) ] ,
1507+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1508+ ConstExpression :: scalar( 200 ) ,
1509+ ) ) ] ,
15061510 } ,
15071511 ] ;
15081512
@@ -1525,14 +1529,18 @@ mod tests {
15251529 right: Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 0 ) ) ) ,
15261530 } ,
15271531 then_branch: vec![ Line :: FunctionRet {
1528- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 100 ) ) ) ] ,
1532+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1533+ ConstExpression :: scalar( 100 ) ,
1534+ ) ) ] ,
15291535 } ] ,
15301536 else_branch: vec![ ] ,
15311537 } ] ,
15321538 else_branch: vec![ ] ,
15331539 } ,
15341540 Line :: FunctionRet {
1535- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 300 ) ) ) ] ,
1541+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1542+ ConstExpression :: scalar( 300 ) ,
1543+ ) ) ] ,
15361544 } ,
15371545 ] ;
15381546
@@ -1549,10 +1557,14 @@ mod tests {
15491557 right: Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 0 ) ) ) ,
15501558 } ,
15511559 then_branch: vec![ Line :: FunctionRet {
1552- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 100 ) ) ) ] ,
1560+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1561+ ConstExpression :: scalar( 100 ) ,
1562+ ) ) ] ,
15531563 } ] ,
15541564 else_branch: vec![ Line :: FunctionRet {
1555- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 200 ) ) ) ] ,
1565+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1566+ ConstExpression :: scalar( 200 ) ,
1567+ ) ) ] ,
15561568 } ] ,
15571569 } ] ;
15581570
@@ -1585,7 +1597,12 @@ mod tests {
15851597
15861598 // Should be restructured to proper if-else
15871599 assert_eq ! ( lines. len( ) , 1 ) ;
1588- if let Line :: IfCondition { condition : _, then_branch, else_branch } = & lines[ 0 ] {
1600+ if let Line :: IfCondition {
1601+ condition : _,
1602+ then_branch,
1603+ else_branch,
1604+ } = & lines[ 0 ]
1605+ {
15891606 assert_eq ! ( then_branch. len( ) , 1 ) ;
15901607 assert_eq ! ( else_branch. len( ) , 1 ) ;
15911608 } else {
@@ -1603,12 +1620,16 @@ mod tests {
16031620 right: Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 0 ) ) ) ,
16041621 } ,
16051622 then_branch: vec![ Line :: FunctionRet {
1606- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 100 ) ) ) ] ,
1623+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1624+ ConstExpression :: scalar( 100 ) ,
1625+ ) ) ] ,
16071626 } ] ,
16081627 else_branch: vec![ ] ,
16091628 } ,
16101629 Line :: FunctionRet {
1611- return_data: vec![ Expression :: Value ( SimpleExpr :: Constant ( ConstExpression :: scalar( 200 ) ) ) ] ,
1630+ return_data: vec![ Expression :: Value ( SimpleExpr :: Constant (
1631+ ConstExpression :: scalar( 200 ) ,
1632+ ) ) ] ,
16121633 } ,
16131634 ] ;
16141635
@@ -1617,12 +1638,16 @@ mod tests {
16171638 inline_lines ( & mut lines, & args, & res, 0 ) ;
16181639
16191640 // Should not have multiple assignments to same variable
1620- let result_assignments = lines. iter ( ) . filter ( |line| {
1621- matches ! ( line, Line :: Assignment { var, .. } if var == "result" )
1622- } ) . count ( ) ;
1641+ let result_assignments = lines
1642+ . iter ( )
1643+ . filter ( |line| matches ! ( line, Line :: Assignment { var, .. } if var == "result" ) )
1644+ . count ( ) ;
16231645
16241646 // With restructuring, direct assignments should be minimal
1625- assert ! ( result_assignments <= 1 , "Should avoid multiple direct assignments" ) ;
1647+ assert ! (
1648+ result_assignments <= 1 ,
1649+ "Should avoid multiple direct assignments"
1650+ ) ;
16261651 }
16271652
16281653 #[ test]
0 commit comments