From 927fc7246cd2894d5c4ab3007e3eebef05dc4863 Mon Sep 17 00:00:00 2001
From: hyperpolymath <6759885+hyperpolymath@users.noreply.github.com>
Date: Thu, 4 Jun 2026 10:35:43 +0100
Subject: [PATCH 1/2] chore(deps): bump nom from 7.1.3 to 8.0.0 (#204)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [nom](https://github.com/rust-bakery/nom) from 7.1.3 to 8.0.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rust-bakery/nom/blob/main/CHANGELOG.md">nom's
changelog</a>.</em></p>
<blockquote>
<h2>8.0.0 2025-01-25</h2>
<p>This version represents a significant refactoring of nom to reduce
the amount of code generated by parsers, and reduce the API surface. As
such, it comes with some breaking changes, mostly around the move from
closure based combinators to trait based ones. In practice, it means
that instead of writing <code>combinator(arg)(input)</code>, we now
write <code>combinator(arg).parse(input)</code>.</p>
<p>This release also marks the introduction of the <a
href="https://crates.io/crates/nom-language">nom-language</a> crate,
which will hold tools more focused on language parsing than the rest of
nom, like the <code>VerboseError</code> type and the newly added
precedence parsing combinators.</p>
<h3>Thanks</h3>
<ul>
<li><a href="https://github.com/cky"><code>@​cky</code></a></li>
<li><a
href="https://github.com/5c077m4n"><code>@​5c077m4n</code></a></li>
<li><a href="https://github.com/epage"><code>@​epage</code></a></li>
<li><a href="https://github.com/Fumon"><code>@​Fumon</code></a></li>
<li><a href="https://github.com/jtracey"><code>@​jtracey</code></a></li>
<li><a
href="https://github.com/OliveIsAWord"><code>@​OliveIsAWord</code></a></li>
<li><a href="https://github.com/Xiretza"><code>@​Xiretza</code></a></li>
<li><a href="https://github.com/flier"><code>@​flier</code></a></li>
<li><a href="https://github.com/cenodis"><code>@​cenodis</code></a></li>
<li><a
href="https://github.com/Shadow53"><code>@​Shadow53</code></a></li>
<li>@<a href="https://github.com/jmmaa"><code>@​jmmaa</code></a></li>
<li><a href="https://github.com/terror"><code>@​terror</code></a></li>
<li><a href="https://github.com/zanedp"><code>@​zanedp</code></a></li>
<li><a
href="https://github.com/atouchet"><code>@​atouchet</code></a></li>
<li><a href="https://github.com/CMDJojo"><code>@​CMDJojo</code></a></li>
<li><a
href="https://github.com/ackxolotl"><code>@​ackxolotl</code></a></li>
<li><a href="https://github.com/xmakro"><code>@​xmakro</code></a></li>
<li><a href="https://github.com/tfpk"><code>@​tfpk</code></a></li>
<li><a
href="https://github.com/WhyNotHugo"><code>@​WhyNotHugo</code></a></li>
<li><a href="https://github.com/brollb"><code>@​brollb</code></a></li>
<li><a
href="https://github.com/smheidrich"><code>@​smheidrich</code></a></li>
<li><a
href="https://github.com/glittershark"><code>@​glittershark</code></a></li>
<li><a
href="https://github.com/GuillaumeGomez"><code>@​GuillaumeGomez</code></a></li>
<li><a
href="https://github.com/LeoDog896"><code>@​LeoDog896</code></a></li>
<li><a href="https://github.com/fmiras"><code>@​fmiras</code></a></li>
<li><a
href="https://github.com/ttsugriy"><code>@​ttsugriy</code></a></li>
<li><a
href="https://github.com/McDostone"><code>@​McDostone</code></a></li>
<li><a
href="https://github.com/superboum"><code>@​superboum</code></a></li>
<li><a href="https://github.com/rruppy"><code>@​rruppy</code></a></li>
<li><a href="https://github.com/thssuck"><code>@​thssuck</code></a></li>
<li><a
href="https://github.com/Chasing1020"><code>@​Chasing1020</code></a></li>
<li><a
href="https://github.com/thatmarkenglishguy"><code>@​thatmarkenglishguy</code></a></li>
<li><a href="https://github.com/ambiso"><code>@​ambiso</code></a></li>
<li><a href="https://github.com/boxdot"><code>@​boxdot</code></a></li>
<li><a href="https://github.com/krtab"><code>@​krtab</code></a></li>
<li><a
href="https://github.com/code10129"><code>@​code10129</code></a></li>
<li><a href="https://github.com/manunio"><code>@​manunio</code></a></li>
<li><a href="https://github.com/stuarth"><code>@​stuarth</code></a></li>
<li><a href="https://github.com/mindeng"><code>@​mindeng</code></a></li>
<li><a
href="https://github.com/JonathanPlasse"><code>@​JonathanPlasse</code></a></li>
<li><a
href="https://github.com/nabilwadih"><code>@​nabilwadih</code></a></li>
<li><a
href="https://github.com/phoenixr-codes"><code>@​phoenixr-codes</code></a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rust-bakery/nom/commit/2cec1b3e4c9ccac62c902d60c00de6d1549ccbe1"><code>2cec1b3</code></a>
v8.0.0 (<a
href="https://redirect.github.com/rust-bakery/nom/issues/1797">#1797</a>)</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/7afe3a8c4021871a8647d3bbf928aecd551c9b62"><code>7afe3a8</code></a>
Merge pull request <a
href="https://redirect.github.com/rust-bakery/nom/issues/1793">#1793</a>
from rust-bakery/beta.1</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/84af9e79216462cf00fc7c85cbbbdb67d6897110"><code>84af9e7</code></a>
nom 8.0.0-beta.1</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/555eab9ddcbd6665626150ed14d17106eb85ad5f"><code>555eab9</code></a>
Merge pull request <a
href="https://redirect.github.com/rust-bakery/nom/issues/1792">#1792</a>
from rust-bakery/nom-language</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/6a25312dbf4df8fe0ad1f1dc5de19843139d381e"><code>6a25312</code></a>
fix nom-language tests</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/bcc1b0cb64bcbf82ab3f35e32eec1429129e5d02"><code>bcc1b0c</code></a>
move the left_assoc combinator to nom-language</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/9b0e18cf5a75964a3d4a841292c0aacf6a513c39"><code>9b0e18c</code></a>
Implement new parser <code>left_assoc</code>. (<a
href="https://redirect.github.com/rust-bakery/nom/issues/1775">#1775</a>)</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/cb3b5b8ebbbca2efe81ae4089541bab322bc3bfe"><code>cb3b5b8</code></a>
move precedence parsing to nom-language</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/f1abba64a7384a29602ee0df00b4809e1fd39f2a"><code>f1abba6</code></a>
fix precedence parsing</li>
<li><a
href="https://github.com/rust-bakery/nom/commit/6c124693c10dd3e932013fdfa0e1690af8b53af7"><code>6c12469</code></a>
Precedence parsing (<a
href="https://redirect.github.com/rust-bakery/nom/issues/1362">#1362</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/rust-bakery/nom/compare/7.1.3...8.0.0">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 11 ++---------
 Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 87bce49e..f098e7ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2030,12 +2030,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -2147,12 +2141,11 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "7.1.3"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 dependencies = [
  "memchr",
- "minimal-lexical",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 314dae14..79e0e43d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ reqwest = { version = "0.12", default-features = false, features = ["json", "rus
 actix = "0.13"
 
 # Parsing
-nom = "7"
+nom = "8"
 
 # REPL
 rustyline = "18"

From 7f97ff8382d345c80330e80dea081ffc7f7de81b Mon Sep 17 00:00:00 2001
From: hyperpolymath <6759885+hyperpolymath@users.noreply.github.com>
Date: Sun, 14 Jun 2026 02:51:37 +0100
Subject: [PATCH 2/2] fix(spdx): correct FileCopyrightText in src/rust/main.rs

Was "ECHIDNA Project Team"; owner-confirmed 2026-06-14.
Unblocks pre-commit hook on this branch.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/rust/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rust/main.rs b/src/rust/main.rs
index ad2c6b08..b6674d6d 100644
--- a/src/rust/main.rs
+++ b/src/rust/main.rs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 ECHIDNA Project Team
+// SPDX-FileCopyrightText: 2025 Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
 // SPDX-License-Identifier: MPL-2.0
 
 //! ECHIDNA CLI - Main binary entry point