From a255fbc950a2a0c71090fa9e15eeafc7171f4bfa Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Sat, 25 Nov 2023 01:45:18 +0000
Subject: [PATCH] Pin aho-corasick to fix aarch64 build

---
 Cargo.lock | 5 +++--
 Cargo.toml | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 63e35ed43b..8f95fa2af8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,9 +15,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
 dependencies = [
  "memchr",
 ]
@@ -255,6 +255,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 name = "difftastic"
 version = "0.54.0"
 dependencies = [
+ "aho-corasick",
  "assert_cmd",
  "bumpalo",
  "cc",
diff --git a/Cargo.toml b/Cargo.toml
index 06c9aafd4c..df9524718e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,6 +57,13 @@ libmimalloc-sys = "=0.1.24"
 radix-heap = "0.4.2"
 # ignore 0.4.19 requires scoped_threads, which was added in rust 1.63.
 ignore = ">= 0.4, < 0.4.19"
+# aho-corasick is a dependency of regex and ignore. In 1.1.0 it added
+# usage of the target feature 'neon' on aarch64, which is unstable on
+# rust 1.60.
+# 
+# https://github.com/BurntSushi/aho-corasick/commit/0be6fe43822aeb193d8894fd1400c8b843320ef0
+# https://github.com/rust-lang/rust/pull/90621#issuecomment-1068998914
+aho-corasick = ">= 1.0, < 1.1.0"
 const_format = "0.2.22"
 owo-colors = "3.5.0"
 wu-diff = "0.1.2"