From 7cc625dd0100fbaf516b81c9306ab54b31db6aac Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Fri, 8 Mar 2024 11:04:23 -0800
Subject: [PATCH] Configuration updates for vendoring

---
 .cargo/config.toml |  11 +++++
 Cargo.lock         | 109 +++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml         |   2 +-
 fine/Cargo.toml    |   1 +
 4 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 21405c0d..7a4f9fb4 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -4,3 +4,14 @@
 # something. But the reason for that error is beyond my ability to care at
 # the moment.)
 rustflags = ["-C","link-self-contained=on"]
+
+# Vendor configuration, output of `cargo vendor`.
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/salsa-rs/salsa.git"]
+git = "https://github.com/salsa-rs/salsa.git"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "third-party/vendor"
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 43ed56a4..f971a182 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,6 +109,12 @@ version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
+[[package]]
+name = "arc-swap"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
+
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -436,6 +442,19 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.12"
@@ -445,6 +464,34 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.19"
@@ -642,6 +689,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "fdeflate"
 version = "0.3.4"
@@ -672,6 +729,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
+ "salsa-2022",
  "syn 2.0.52",
  "thiserror",
 ]
@@ -903,6 +961,15 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.3",
+]
+
 [[package]]
 name = "hassle-rs"
 version = "0.10.0"
@@ -918,6 +985,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -974,6 +1047,12 @@ dependencies = [
  "png",
 ]
 
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -1984,6 +2063,36 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
+[[package]]
+name = "salsa-2022"
+version = "0.1.0"
+source = "git+https://github.com/salsa-rs/salsa.git#f1d318a2795e87081e316a5f31ef02f0cd6a1c83"
+dependencies = [
+ "arc-swap",
+ "crossbeam",
+ "crossbeam-utils",
+ "dashmap",
+ "hashlink",
+ "indexmap 2.2.5",
+ "log",
+ "parking_lot",
+ "rustc-hash",
+ "salsa-2022-macros",
+ "smallvec",
+]
+
+[[package]]
+name = "salsa-2022-macros"
+version = "0.1.0"
+source = "git+https://github.com/salsa-rs/salsa.git#f1d318a2795e87081e316a5f31ef02f0cd6a1c83"
+dependencies = [
+ "eyre",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
diff --git a/Cargo.toml b/Cargo.toml
index 36129983..feb4c1ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,4 +6,4 @@ members = [
   "oden",
   "oden-js",
   "oden-js-sys",
-]
\ No newline at end of file
+]
diff --git a/fine/Cargo.toml b/fine/Cargo.toml
index d07b3794..6abccf48 100644
--- a/fine/Cargo.toml
+++ b/fine/Cargo.toml
@@ -15,3 +15,4 @@ syn = "2.0.47"
 
 [dependencies]
 thiserror = "1.0.56"
+salsa = { git = "https://github.com/salsa-rs/salsa.git", package = "salsa-2022" }
\ No newline at end of file