From f24bdeab79dc68fb1d4e580c129a7a540a639107 Mon Sep 17 00:00:00 2001
From: James Lucas <jaymell@users.noreply.github.com>
Date: Wed, 15 Nov 2023 11:46:47 -0600
Subject: [PATCH] Stop forking aide

The issue for which we originally forked aide appears to have been
fixed here: https://github.com/tamasfe/aide/pull/73

Our code compiles using the latest aide version, and the openapi
spec shows no changes, so I think we're good.
---
 server/Cargo.lock             | 52 +++++++++++++++++++++++++----------
 server/svix-server/Cargo.toml |  2 +-
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/server/Cargo.lock b/server/Cargo.lock
index 322c2c98b..1f166148f 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -50,13 +50,15 @@ dependencies = [
 
 [[package]]
 name = "aide"
-version = "0.10.0"
-source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b9ab2c8531a5ac6bcc579cc4c308d1b4bd5b9910a0f08bf4e65b3452407400"
 dependencies = [
  "aide-macros",
  "axum",
  "bytes",
  "cfg-if",
+ "derive_more",
  "http",
  "indexmap 1.9.3",
  "schemars",
@@ -71,13 +73,14 @@ dependencies = [
 
 [[package]]
 name = "aide-macros"
-version = "0.6.0"
-source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0487f8598afe49e6bc950a613a678bd962c4a6f431022ded62643c8b990301a"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -775,6 +778,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
 [[package]]
 name = "cookie-factory"
 version = "0.3.2"
@@ -886,9 +895,9 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
 
 [[package]]
 name = "darling"
-version = "0.14.4"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -896,27 +905,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.4"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 1.0.109",
+ "syn 2.0.29",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.4"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -968,6 +977,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "des"
 version = "0.8.1"
@@ -3584,9 +3606,9 @@ dependencies = [
 
 [[package]]
 name = "serde_qs"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c679fa27b429f2bb57fd4710257e643e86c966e716037259f8baa33de594a1b6"
+checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c"
 dependencies = [
  "axum",
  "futures",
diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml
index 98ec10c11..0de1c9203 100644
--- a/server/svix-server/Cargo.toml
+++ b/server/svix-server/Cargo.toml
@@ -64,7 +64,7 @@ futures = "0.3"
 url = { version = "2.2.2", features = ["serde"] }
 rand = "0.8.5"
 jsonschema = "0.16.1"
-aide = { git = "https://github.com/svix/aide", rev = "e6e9af3", features = ["axum", "redoc", "macros", "axum-headers"] }
+aide = { version = "0.12.0", features = ["axum", "redoc", "macros", "axum-headers"] }
 schemars = { version = "0.8.11", features = ["chrono", "url", "preserve_order"] }
 indexmap = "1.9.2"
 trust-dns-resolver = "0.22.0"