From bc9dc49734326319d45a3ed83ffde4396be0530d Mon Sep 17 00:00:00 2001
From: "eryn L. K" <eryn@eryn.io>
Date: Fri, 5 May 2023 15:26:17 -0400
Subject: [PATCH] Fix full moon version

Supersedes #128
---
 extractor/Cargo.lock | 37 ++++++++++++++++++++++++++++++++++---
 extractor/Cargo.toml |  2 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/extractor/Cargo.lock b/extractor/Cargo.lock
index 7d13909..b6764f0 100644
--- a/extractor/Cargo.lock
+++ b/extractor/Cargo.lock
@@ -52,6 +52,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
 
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -134,8 +140,9 @@ checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
 
 [[package]]
 name = "full_moon"
-version = "0.17.0"
-source = "git+https://github.com/Kampfkarren/full-moon.git?rev=5a8262720399c6540ade4210c4735d40b2e2df15#5a8262720399c6540ade4210c4735d40b2e2df15"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b9a9bf5e42aec08f4b59be1438d66b01ab0a0f51dca309626e219697b60871c"
 dependencies = [
  "bytecount",
  "cfg-if",
@@ -145,12 +152,14 @@ dependencies = [
  "paste",
  "serde",
  "smol_str",
+ "stacker",
 ]
 
 [[package]]
 name = "full_moon_derive"
 version = "0.11.0"
-source = "git+https://github.com/Kampfkarren/full-moon.git?rev=5a8262720399c6540ade4210c4735d40b2e2df15#5a8262720399c6540ade4210c4735d40b2e2df15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b4bd12ce56927d1dc5478d21528ea8c4b93ca85ff8f8043b6a5351a2a3c6f7"
 dependencies = [
  "indexmap",
  "proc-macro2",
@@ -314,6 +323,15 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "psm"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.23"
@@ -405,6 +423,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "stacker"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "psm",
+ "winapi",
+]
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
diff --git a/extractor/Cargo.toml b/extractor/Cargo.toml
index 9e5b06c..e19aee9 100644
--- a/extractor/Cargo.toml
+++ b/extractor/Cargo.toml
@@ -22,7 +22,7 @@ opt-level = 1
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-full_moon = { git = "https://github.com/Kampfkarren/full-moon.git", rev = "5a8262720399c6540ade4210c4735d40b2e2df15" } # Specify commit fixing newlines until new release is cut
+full_moon = { version = "0.18.1", features = ["stacker"] }
 walkdir = "2"
 anyhow = "1.0.28"
 codespan-reporting = "0.9.5"