From 1c2971b8a8c8b0f242d5689a6c792cb193da1db9 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 14 Aug 2023 20:15:02 +0300
Subject: [PATCH] update nom

`warning: the following packages contain code that will be rejected by a future version of Rust: nom v4.2.3, traitobject v0.1.0`

Not updating to the newest version for now, it requires more changes.

https://crates.io/crates/nom/versions

https://github.com/rust-bakery/nom/blob/main/CHANGELOG.md#500---2019-06-24

> The CompleteByteSlice and CompleteStr input types were removed. To get different behaviour related to streaming or complete input, there are different versions of some parsers in different submodules, like nom::character::streaming::alpha0 and nom::character::complete::alpha0.
---
 Cargo.lock        | 72 ++++++++++++++++++++++++++++++++++++++++++++---
 ofborg/Cargo.toml |  2 +-
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bbd134dd..774e9126 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,6 +89,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -311,6 +317,18 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
+[[package]]
+name = "bitvec"
+version = "0.19.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -621,6 +639,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
 [[package]]
 name = "futures"
 version = "0.3.28"
@@ -1085,6 +1109,19 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.147"
@@ -1234,12 +1271,15 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "4.2.3"
+version = "6.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
 dependencies = [
+ "bitvec",
+ "funty",
+ "lexical-core",
  "memchr",
- "version_check 0.1.5",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -1326,7 +1366,7 @@ dependencies = [
  "lapin",
  "lru-cache",
  "md5",
- "nom 4.2.3",
+ "nom 6.1.2",
  "regex",
  "rustls-pemfile",
  "separator",
@@ -1557,6 +1597,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
 [[package]]
 name = "rc2"
 version = "0.8.1"
@@ -1979,6 +2025,12 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -2006,6 +2058,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tcp-stream"
 version = "0.26.1"
@@ -2527,6 +2585,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
index 2f372157..d08f8711 100644
--- a/ofborg/Cargo.toml
+++ b/ofborg/Cargo.toml
@@ -21,7 +21,7 @@ http = "0.2"
 lapin = "2.3.1"
 lru-cache = "0.1.2"
 md5 = "0.7.0"
-nom = "4.2.3"
+nom = "6"
 regex = "1.9.3"
 separator = "0.4.1"
 serde = "1.0"