From a44c32694f69c667b2937846d502d8943567213a Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Fri, 2 Apr 2021 19:23:25 -0600
Subject: [PATCH] merkle-tree: Use `matches` crate when targeting eBPF

---
 Cargo.lock             | 1 +
 merkle-tree/Cargo.toml | 4 ++++
 merkle-tree/src/lib.rs | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index eed6d19d75..4aaa8bd81c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4792,6 +4792,7 @@ version = "1.7.0"
 dependencies = [
  "fast-math",
  "hex",
+ "matches",
  "solana-program 1.7.0",
 ]
 
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index 53adadf114..afae0fded0 100644
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -13,6 +13,10 @@ edition = "2018"
 solana-program = { path = "../sdk/program", version = "=1.7.0" }
 fast-math = "0.1"
 
+# This can go once the BPF toolchain target Rust 1.42.0+
+[target.bpfel-unknown-unknown.dependencies]
+matches = "0.1.8"
+
 [dev-dependencies]
 hex = "0.4.2"
 
diff --git a/merkle-tree/src/lib.rs b/merkle-tree/src/lib.rs
index f68e4b7ef4..8732b823df 100644
--- a/merkle-tree/src/lib.rs
+++ b/merkle-tree/src/lib.rs
@@ -1,3 +1,8 @@
 #![allow(clippy::integer_arithmetic)]
+
+#[cfg(target_arch = "bpf")]
+#[macro_use]
+extern crate matches;
+
 pub mod merkle_tree;
 pub use merkle_tree::MerkleTree;