Refactor

rust-lang · Mar 25, 2018 · 8aa55e7 · 8aa55e7
1 parent 9b8e000
commit 8aa55e7
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/libsyntax_ext/assert.rs b/src/libsyntax_ext/assert.rs
@@ -409,16 +409,8 @@ impl<'cx, 'a: 'cx> Context<'cx, 'a> {
 
         match expr.node {
             CondExprKind::BinOp(op, left, right) => {
-                let left_by_ref = if let CondExprKind::Capture(.., mode) = left.node {
-                    mode.is_by_ref()
-                } else {
-                    false
-                };
-                let right_by_ref = if let CondExprKind::Capture(.., mode) = right.node {
-                    mode.is_by_ref()
-                } else {
-                    false
-                };
+                let left_by_ref = left.is_by_ref_capture();
+                let right_by_ref = right.is_by_ref_capture();
 
                 let with_left = Action::Value(Rc::new(move |left, is_evaluated| {
                     let action = action.clone();
@@ -663,6 +655,13 @@ impl CondExpr {
         matches!(self.node, CondExprKind::Capture(..))
     }
 
+    fn is_by_ref_capture(&self) -> bool {
+        matches!(
+            self.node,
+            CondExprKind::Capture(_, _, BindingMode::ByRef(_))
+        )
+    }
+
     fn is_lazy_binop(&self) -> bool {
         if let CondExprKind::BinOp(op, ..) = self.node {
             op.lazy()