use None and Some(_) in Stmt::Expr() convension from syn1 to syn2 to match the existing behavior

Author: bungcip

c2rust-transpile/src/cfg/inc_cleanup.rs

@@ -33,7 +33,7 @@ impl IncCleanup {
 
         let mut removed_tail_expr = false;
 
-        if let Stmt::Expr(expr, _) = &mut stmt {
+        if let Stmt::Expr(expr, None) = &mut stmt {
             match expr {
                 Expr::If(ExprIf {
                     cond: _,
@@ -74,7 +74,7 @@ impl IncCleanup {
     }
 
     fn is_idempotent_tail_expr(&self, stmt: &Stmt) -> bool {
-        let tail_expr = if let Stmt::Expr(expr, _token) = stmt {
+        let tail_expr = if let Stmt::Expr(expr, Some(_token)) = stmt {
             expr
         } else {
             return false;
@@ -151,7 +151,7 @@ fn cleanup_if(stmt: Stmt) -> Stmt {
                 );
             } else if block.stmts.len() == 1 {
                 // flatten nested if expression to else if chain
-                if let Stmt::Expr(Expr::If(nested_if_expr), _semi) = &block.stmts[0] {
+                if let Stmt::Expr(Expr::If(nested_if_expr), None) = &block.stmts[0] {
                     return Stmt::Expr(
                         Expr::If(ExprIf {
                             cond: cond.clone(),

c2rust-transpile/src/cfg/structures.rs

@@ -530,7 +530,7 @@ impl StructureState {
                     }
                     (false, false) => {
                         fn is_expr(kind: &Stmt) -> bool {
-                            matches!(kind, Stmt::Expr(Expr::If(..) | Expr::Block(..), _semi))
+                            matches!(kind, Stmt::Expr(Expr::If(..) | Expr::Block(..), None))
                         }
 
                         // Do the else statements contain a single If, IfLet or
@@ -542,7 +542,7 @@ impl StructureState {
                             let stmt_expr = els_stmts.swap_remove(0);
                             let stmt_expr_span = stmt_expr.span();
                             let mut els_expr = match stmt_expr {
-                                Stmt::Expr(e, _semi) => e,
+                                Stmt::Expr(e, None) => e,
                                 _ => panic!("is_els_expr out of sync"),
                             };
                             els_expr.set_span(stmt_expr_span);
@@ -605,7 +605,7 @@ impl StructureState {
                 let (body, body_span) = self.to_stmt(*body, comment_store);
 
                 // TODO: this is ugly but it needn't be. We are just pattern matching on particular ASTs.
-                if let Some(stmt @ &Stmt::Expr(ref expr, _semi)) = body.first() {
+                if let Some(stmt @ &Stmt::Expr(ref expr, None)) = body.first() {
                     let stmt_span = stmt.span();
                     let span = if !stmt_span.is_dummy() {
                         stmt_span
@@ -625,7 +625,7 @@ impl StructureState {
                                 expr: None,
                                 ..
                             }),
-                            _token,
+                            Some(_),
                         )] = then_branch.stmts.as_slice()
                         {
                             let e = mk().while_expr(

c2rust-transpile/src/translator/mod.rs

@@ -357,11 +357,11 @@ pub fn stmts_block(mut stmts: Vec<Stmt>) -> Block {
             Expr::Block(ExprBlock {
                 block, label: None, ..
             }),
-            _semi,
+            None,
         )) if stmts.is_empty() => return block,
         Some(mut s) => {
-            if let Stmt::Expr(e, _semi) = s {
-                s = Stmt::Expr(e, _semi);
+            if let Stmt::Expr(e, None) = s {
+                s = Stmt::Expr(e, Some(Default::default()));
             }
             stmts.push(s);
         }
@@ -4025,7 +4025,7 @@ impl<'c> Translation<'c> {
                     expr: ret_val,
                     ..
                 }),
-                _,
+                Some(_),
             ) = stmt
             {
                 if blbl.ident == mk().label(lbl.pretty_print()).name.ident {

c2rust-transpile/src/translator/structs.rs

@@ -755,7 +755,7 @@ impl<'a> Translation<'a> {
                         }
 
                         let last_expr = match block.stmts[last] {
-                            Stmt::Expr(ref expr, _semi) => expr.clone(),
+                            Stmt::Expr(ref expr, None) => expr.clone(),
                             _ => return Err(TranslationError::generic("Expected Expr Stmt")),
                         };
                         let method_call =