From df71df7e875b40529aa9404d45fd391a8857568a Mon Sep 17 00:00:00 2001
From: Akosh Farkash <aakoshh@gmail.com>
Date: Fri, 6 Dec 2024 17:06:02 +0000
Subject: [PATCH] fix: git dependency trailing slash (#6725)

Co-authored-by: Ary Borenszweig <asterite@gmail.com>
---
 Cargo.lock                    |  1 +
 tooling/nargo_toml/Cargo.toml |  1 +
 tooling/nargo_toml/src/git.rs | 28 ++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 141a25f42a9..e8226d5fc58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2882,6 +2882,7 @@ dependencies = [
  "noirc_frontend",
  "semver",
  "serde",
+ "test-case",
  "thiserror",
  "toml 0.7.8",
  "url 2.5.3",
diff --git a/tooling/nargo_toml/Cargo.toml b/tooling/nargo_toml/Cargo.toml
index e4766e44859..2bc24153836 100644
--- a/tooling/nargo_toml/Cargo.toml
+++ b/tooling/nargo_toml/Cargo.toml
@@ -25,3 +25,4 @@ noirc_driver.workspace = true
 semver = "1.0.20"
 
 [dev-dependencies]
+test-case.workspace = true
diff --git a/tooling/nargo_toml/src/git.rs b/tooling/nargo_toml/src/git.rs
index 80e57247ae6..efaed4fabb9 100644
--- a/tooling/nargo_toml/src/git.rs
+++ b/tooling/nargo_toml/src/git.rs
@@ -3,16 +3,20 @@ use std::path::PathBuf;
 /// Creates a unique folder name for a GitHub repo
 /// by using its URL and tag
 fn resolve_folder_name(base: &url::Url, tag: &str) -> String {
-    let mut folder_name = base.domain().unwrap().to_owned();
-    folder_name.push_str(base.path());
-    folder_name.push_str(tag);
-    folder_name
+    let mut folder = PathBuf::from("");
+    for part in [base.domain().unwrap(), base.path(), tag] {
+        folder.push(part.trim_start_matches('/'));
+    }
+    folder.to_string_lossy().into_owned()
 }
 
+/// Path to the `nargo` directory under `$HOME`.
 fn nargo_crates() -> PathBuf {
     dirs::home_dir().unwrap().join("nargo")
 }
 
+/// Target directory to download dependencies into, e.g.
+/// `$HOME/nargo/github.com/noir-lang/noir-bignum/v0.1.2`
 fn git_dep_location(base: &url::Url, tag: &str) -> PathBuf {
     let folder_name = resolve_folder_name(base, tag);
 
@@ -53,3 +57,19 @@ pub(crate) fn clone_git_repo(url: &str, tag: &str) -> Result<PathBuf, String> {
 
     Ok(loc)
 }
+
+#[cfg(test)]
+mod tests {
+    use test_case::test_case;
+    use url::Url;
+
+    use super::resolve_folder_name;
+
+    #[test_case("https://github.com/noir-lang/noir-bignum/"; "with slash")]
+    #[test_case("https://github.com/noir-lang/noir-bignum"; "without slash")]
+    fn test_resolve_folder_name(url: &str) {
+        let tag = "v0.4.2";
+        let dir = resolve_folder_name(&Url::parse(url).unwrap(), tag);
+        assert_eq!(dir, "github.com/noir-lang/noir-bignum/v0.4.2");
+    }
+}