Fix path in include_file function when outdir used (#544)

Co-authored-by: Lucio Franco <[email protected]>
Co-authored-by: Lucio Franco <[email protected]>

prost-build/src/lib.rs

@@ -924,11 +924,11 @@ impl Config {
             written += subwritten;
             if subwritten != matching.len() {
                 let modname = matching[0][..=depth].join(".");
-                if let Some(buf) = basepath {
+                if let Some(_) = basepath {
                     self.write_line(
                         outfile,
                         depth + 1,
-                        &format!("include!(\"{}/{}.rs\");", buf.display(), modname),
+                        &format!("include!(\"{}.rs\");", modname),
                     )?;
                 } else {
                     self.write_line(

tests/single-include/build.rs

@@ -5,4 +5,10 @@ fn main() {
         .include_file("lib.rs")
         .compile_protos(&["protos/search.proto"], &["protos"])
         .unwrap();
+
+    Config::new()
+        .out_dir("src/outdir")
+        .include_file("mod.rs")
+        .compile_protos(&["protos/outdir.proto"], &["protos"])
+        .unwrap();
 }

tests/single-include/protos/outdir.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package outdir;
+
+message OutdirRequest {
+  string query = 1;
+  int32 page_number = 2;
+  int32 result_per_page = 3;
+}

tests/single-include/src/lib.rs

@@ -1 +1,2 @@
 include!(concat!(env!("OUT_DIR"), "/lib.rs"));
+include!("./outdir/mod.rs");

tests/single-include/src/main.rs

@@ -1,3 +1,5 @@
 fn main() {
     let _search_req = single_include::search::SearchRequest::default();
+
+    let _out_dir_test = single_include::outdir::OutdirRequest::default();
 }

tests/single-include/src/outdir/mod.rs

@@ -0,0 +1,3 @@
+pub mod outdir {
+    include!("outdir.rs");
+}

tests/single-include/src/outdir/outdir.rs

@@ -0,0 +1,9 @@
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct OutdirRequest {
+    #[prost(string, tag="1")]
+    pub query: ::prost::alloc::string::String,
+    #[prost(int32, tag="2")]
+    pub page_number: i32,
+    #[prost(int32, tag="3")]
+    pub result_per_page: i32,
+}