From a195106117ebaa6ab97e8963b7f1d66225eee4bc Mon Sep 17 00:00:00 2001
From: acheron <98934430+acheroncrypto@users.noreply.github.com>
Date: Mon, 1 May 2023 13:39:50 +0200
Subject: [PATCH] spl: Use fixed version for `winnow` crate to fix new builds
 (#2478)

---
 Cargo.lock     | 10 ++++++++++
 spl/Cargo.toml |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 89efdfbf63..38b49d6f22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -263,6 +263,7 @@ dependencies = [
  "spl-associated-token-account",
  "spl-token",
  "spl-token-2022",
+ "winnow",
 ]
 
 [[package]]
@@ -5489,6 +5490,15 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "winnow"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.10.1"
diff --git a/spl/Cargo.toml b/spl/Cargo.toml
index 0c4f21af13..659503c80f 100644
--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@@ -29,3 +29,8 @@ spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true }
 spl-token-2022 = { version = "0.5.0", features = ["no-entrypoint"], optional = true }
 spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true }
 mpl-token-metadata = { version = "^1.9.0", optional = true, features = ["no-entrypoint"] }
+
+# TODO: Remove after updating to latest version of platform-tools.
+# Latest solana version(1.14.17) as of 2023-05-01 comes with rustc 1.62.0-dev but MSRV for latest
+# version of this crate is 1.64.0. See https://github.com/solana-labs/solana/pull/31418
+winnow = "=0.4.1"