From 86a290c84207570736dc62a8ae585628cadc6325 Mon Sep 17 00:00:00 2001
From: Shayne Fletcher <shaynefletcher@meta.com>
Date: Mon, 5 Feb 2024 09:41:55 -0800
Subject: [PATCH] fix include src paths issues

Summary:
the command `cd fbcode/common/rust/cargo_from_buck/fbcode/security/flare/if/flare_if/types&&cargo build` results in
```
  thread 'main' panicked at thrift_build.rs:71:20:
  Failed while running thrift compilation: No such file or directory (os error 2
```
similarly the command `cd fbcode/common/rust/cargo_from_buck/fbcode/security/flare/if/flare_if/&&CARGO_TARGET_DIR=/tmp cargo build`

this diff fixes both of these cases by avoiding writing files outside of the cargo provided `OUT_DIR`.

Reviewed By: dtolnay

Differential Revision: D53422085

fbshipit-source-id: 989850a5101c657cf20582d843b9ce5c9bda81b4
---
 shed/thrift_compiler/src/lib.rs | 35 +++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/shed/thrift_compiler/src/lib.rs b/shed/thrift_compiler/src/lib.rs
index 04f042563..838d99dfb 100644
--- a/shed/thrift_compiler/src/lib.rs
+++ b/shed/thrift_compiler/src/lib.rs
@@ -180,6 +180,29 @@ impl Config {
         self
     }
 
+    /// Transform a relative path so leading "../"'s are replaced with "_t".
+    pub fn remap_to_out_dir(&self, path: &str) -> PathBuf {
+        let mut rem = path;
+        let mut parts = vec![];
+        while let Some(p) = rem.strip_prefix("../") {
+            rem = p;
+            parts.push("_t");
+        }
+        Path::new(&parts.join("/")).join(rem)
+    }
+
+    /// Map `remap_to_out_dir` over the given paths and join the result with
+    /// ":".
+    pub fn include_srcs_arg(&self, ps: &[String]) -> String {
+        ps.iter()
+            .map(|p| self.remap_to_out_dir(p))
+            .collect::<Vec<PathBuf>>()
+            .iter()
+            .map(|p| p.to_str().unwrap())
+            .collect::<Vec<&str>>()
+            .join(":")
+    }
+
     /// Run the compiler on the input files. As a result a `lib.rs` file will be
     /// generated inside the output dir. The contents of the `lib.rs` can vary
     /// according to the generation context (e.g. for a given thrift library,
@@ -198,13 +221,17 @@ impl Config {
         for lib_include_src in &self.lib_include_srcs {
             println!("cargo:rerun-if-changed={lib_include_src}");
             if let GenContext::Lib = self.gen_context {
-                fs::copy(lib_include_src, out.join(lib_include_src))?;
+                let out_path = self.remap_to_out_dir(lib_include_src);
+                fs::create_dir_all(out.join(out_path.parent().unwrap()))?;
+                fs::copy(lib_include_src, out.join(out_path))?;
             }
         }
         for types_include_src in &self.types_include_srcs {
             println!("cargo:rerun-if-changed={types_include_src}");
             if let GenContext::Types = self.gen_context {
-                fs::copy(types_include_src, out.join(types_include_src))?;
+                let out_path = self.remap_to_out_dir(types_include_src);
+                fs::create_dir_all(out.join(out_path.parent().unwrap()))?;
+                fs::copy(types_include_src, out.join(out_path))?;
             }
         }
 
@@ -440,13 +467,13 @@ impl Config {
             if !self.lib_include_srcs.is_empty() {
                 args.push(format!(
                     "lib_include_srcs={}",
-                    self.lib_include_srcs.join(":")
+                    self.include_srcs_arg(&self.lib_include_srcs)
                 ));
             }
             if !self.types_include_srcs.is_empty() {
                 args.push(format!(
                     "types_include_srcs={}",
-                    self.types_include_srcs.join(":")
+                    self.include_srcs_arg(&self.types_include_srcs)
                 ));
             }
             if let Some(options) = &self.options {