From b4da413cd25faa3c4555de4a48dd15cc280aba6e Mon Sep 17 00:00:00 2001
From: William Aaron Cheung <git@troublor.xyz>
Date: Fri, 5 Jul 2024 23:51:16 -0400
Subject: [PATCH] patch compiler

---
 Cargo.lock                       | 15 +++++----------
 Cargo.toml                       |  3 +++
 crates/forge/tests/cli/config.rs |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 18b3b86d419e..284355da3961 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3689,8 +3689,7 @@ dependencies = [
 [[package]]
 name = "foundry-compilers"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f506a672502997fbc778f1d30eb4a06a58654049ccc6cd0bdb93a785175f682"
+source = "git+https://github.com/troublor/compilers?branch=issue47#c2335428f97614a62653909656c6d656adf3f0d6"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -3727,8 +3726,7 @@ dependencies = [
 [[package]]
 name = "foundry-compilers-artifacts"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c352516419487416dde3250dbb56b576e0605429eb7b7b16f26849d924ee519"
+source = "git+https://github.com/troublor/compilers?branch=issue47#c2335428f97614a62653909656c6d656adf3f0d6"
 dependencies = [
  "foundry-compilers-artifacts-solc",
  "foundry-compilers-artifacts-vyper",
@@ -3737,8 +3735,7 @@ dependencies = [
 [[package]]
 name = "foundry-compilers-artifacts-solc"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49104d442d6f0266c07edbdd23baa9a1db0f01d04bfdc69b6ac060a57e6f3e27"
+source = "git+https://github.com/troublor/compilers?branch=issue47#c2335428f97614a62653909656c6d656adf3f0d6"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -3760,8 +3757,7 @@ dependencies = [
 [[package]]
 name = "foundry-compilers-artifacts-vyper"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f012d22d0690ad6b6bbcc8d70467325212ddea3457e8efda6affe17fb5ae938"
+source = "git+https://github.com/troublor/compilers?branch=issue47#c2335428f97614a62653909656c6d656adf3f0d6"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -3774,8 +3770,7 @@ dependencies = [
 [[package]]
 name = "foundry-compilers-core"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23760fd6df67a9878ed0fe91e024bf1ff3b7358369cf54129539a8493177c6e7"
+source = "git+https://github.com/troublor/compilers?branch=issue47#c2335428f97614a62653909656c6d656adf3f0d6"
 dependencies = [
  "alloy-primitives",
  "cfg-if",
diff --git a/Cargo.toml b/Cargo.toml
index 5c3ae60d585b..075f7a5e28ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -261,3 +261,6 @@ tower = "0.4"
 tower-http = "0.5"
 # soldeer
 soldeer = "0.2.17"
+
+[patch.crates-io]
+foundry-compilers = { git = "https://github.com/troublor/compilers", branch = "issue47", default-features = false }
diff --git a/crates/forge/tests/cli/config.rs b/crates/forge/tests/cli/config.rs
index 699d48caf514..183d238c3110 100644
--- a/crates/forge/tests/cli/config.rs
+++ b/crates/forge/tests/cli/config.rs
@@ -106,7 +106,7 @@ forgetest!(can_extract_config_values, |prj, cmd| {
         etherscan_api_key: None,
         etherscan: Default::default(),
         verbosity: 4,
-        remappings: vec![Remapping::from_str("forge-std=lib/forge-std/").unwrap().into()],
+        remappings: vec![Remapping::from_str("forge-std/=lib/forge-std/").unwrap().into()],
         libraries: vec![
             "src/DssSpell.sol:DssExecLib:0x8De6DDbCd5053d32292AAA0D2105A32d108484a6".to_string()
         ],