From 5a871711215aac0623ec205c708559bf8ea62440 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Wed, 2 Sep 2020 15:57:18 -0700
Subject: [PATCH] Do not use the `matches!` macro so we work with older rustc
 versions

---
 cranelift/codegen/src/souper_harvest.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cranelift/codegen/src/souper_harvest.rs b/cranelift/codegen/src/souper_harvest.rs
index 1e0d0eb382..1ca7aaa227 100644
--- a/cranelift/codegen/src/souper_harvest.rs
+++ b/cranelift/codegen/src/souper_harvest.rs
@@ -420,7 +420,10 @@ fn harvest_candidate_lhs(
             _ => ast::AssignmentRhs::Var,
         };
 
-        non_var_count += !matches!(souper_assignment_rhs, ast::AssignmentRhs::Var) as u32;
+        non_var_count += match souper_assignment_rhs {
+            ast::AssignmentRhs::Var => 0,
+            _ => 1,
+        };
         let souper_ty = souper_type_of(&func.dfg, val);
         let souper_val = lhs.assignment(None, souper_ty, souper_assignment_rhs, vec![]);
         let old_value = allocs.ir_to_souper_val.insert(val, souper_val);