From 5f43fd17bae70ffc4c407be168fe492328fc7d07 Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Tue, 7 Nov 2023 17:12:21 +0100 Subject: [PATCH] Vendor ansi-parser The fork updates `nom` to version 7, removing rustc's deprecation warning. --- .ci/Dockerfile.linux | 2 ++ .ci/Dockerfile.msvc | 2 ++ .gitmodules | 3 ++- Cargo.toml | 5 +++++ lib/ansi-parser | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.ci/Dockerfile.linux b/.ci/Dockerfile.linux index a8124b1..9e93e44 100644 --- a/.ci/Dockerfile.linux +++ b/.ci/Dockerfile.linux @@ -8,6 +8,7 @@ RUN set -e; \ cargo new --lib lib/nexusmods; \ cargo new --lib lib/sdk; \ cargo new --lib lib/serde_sjson; \ + cargo new --lib lib/ansi-parser COPY Cargo.toml Cargo.lock /src/dtmt/ COPY crates/dtmt/Cargo.toml /src/dtmt/crates/dtmt/ @@ -16,6 +17,7 @@ COPY lib/dtmt-shared/Cargo.toml /src/dtmt/lib/dtmt-shared/ COPY lib/nexusmods/Cargo.toml /src/dtmt/lib/nexusmods/ COPY lib/sdk/Cargo.toml /src/dtmt/lib/sdk/ COPY lib/serde_sjson/Cargo.toml /src/dtmt/lib/serde_sjson/ +COPY lib/ansi-parser/Cargo.toml /src/dtmt/lib/ansi-parser/ # Crates with build scripts cannot be split that way, but they shouldn't change too often COPY lib/luajit2-sys /src/dtmt/lib/luajit2-sys diff --git a/.ci/Dockerfile.msvc b/.ci/Dockerfile.msvc index f3c722b..e8c9c32 100644 --- a/.ci/Dockerfile.msvc +++ b/.ci/Dockerfile.msvc @@ -8,6 +8,7 @@ RUN set -e; \ cargo new --lib lib/nexusmods; \ cargo new --lib lib/sdk; \ cargo new --lib lib/serde_sjson; \ + cargo new --lib lib/ansi-parser COPY Cargo.toml Cargo.lock /src/dtmt/ COPY crates/dtmt/Cargo.toml /src/dtmt/crates/dtmt/ @@ -16,6 +17,7 @@ COPY lib/dtmt-shared/Cargo.toml /src/dtmt/lib/dtmt-shared/ COPY lib/nexusmods/Cargo.toml /src/dtmt/lib/nexusmods/ COPY lib/sdk/Cargo.toml /src/dtmt/lib/sdk/ COPY lib/serde_sjson/Cargo.toml /src/dtmt/lib/serde_sjson/ +COPY lib/ansi-parser/Cargo.toml /src/dtmt/lib/ansi-parser/ # Crates with build scripts cannot be split that way, but they shouldn't change too often COPY lib/luajit2-sys /src/dtmt/lib/luajit2-sys diff --git a/.gitmodules b/.gitmodules index c31f9da..9398bb8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,5 @@ url = https://github.com/sclu1034/color-eyre.git [submodule "lib/ansi-parser"] path = lib/ansi-parser - url = git@gitlab.com:lschwiderski/ansi-parser.git + url = https://gitlab.com/lschwiderski/ansi-parser.git + branch = "issue/outdated-nom" diff --git a/Cargo.toml b/Cargo.toml index 4912871..123b2ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,14 @@ members = [ "lib/sdk", "lib/serde_sjson", ] +exclude = [ + "lib/color-eyre", + "lib/ansi-parser", +] [patch.crates-io] color-eyre = { path = "lib/color-eyre" } +ansi-parser = { path = "lib/ansi-parser" } [profile.dev.package.backtrace] opt-level = 3 diff --git a/lib/ansi-parser b/lib/ansi-parser index 28001c3..27beb4b 160000 --- a/lib/ansi-parser +++ b/lib/ansi-parser @@ -1 +1 @@ -Subproject commit 28001c31975ecaefd0133e952dd6bb6386f6c701 +Subproject commit 27beb4bc1ffd2865a432e13f0588b5351ff419bf