Make the procedural macros read files relative to $CARGO_MANIFEST_DIR (#167)

Michael-F-Bryan · web-flow · commit 273947434f95 · 2022-03-10T10:58:17.000-06:00
(fixes #159)
diff --git a/crates/rust-wasm-impl/src/lib.rs b/crates/rust-wasm-impl/src/lib.rs
@@ -1,3 +1,5 @@
+use std::path::{Path, PathBuf};
+
 use proc_macro::TokenStream;
 use syn::parse::{Error, Parse, ParseStream, Result};
 use syn::punctuated::Punctuated;
@@ -28,11 +30,11 @@ fn run(input: TokenStream, dir: Direction) -> TokenStream {
 
     // Include a dummy `include_str!` for any files we read so rustc knows that
     // we depend on the contents of those files.
-    let cwd = std::env::current_dir().unwrap();
+    let cwd = std::env::var("CARGO_MANIFEST_DIR").unwrap();
     for file in input.files.iter() {
         contents.push_str(&format!(
             "const _: &str = include_str!(r#\"{}\"#);\n",
-            cwd.join(file).display()
+            Path::new(&cwd).join(file).display()
         ));
     }
 
@@ -82,7 +84,9 @@ impl Parse for Opts {
                 files.push(s.value());
             }
             let mut interfaces = Vec::new();
+            let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
             for path in files.iter() {
+                let path = manifest_dir.join(path);
                 let iface = Interface::parse_file(path).map_err(|e| Error::new(call_site, e))?;
                 interfaces.push(iface);
             }
@@ -123,7 +127,9 @@ impl Parse for ConfigField {
             let paths = Punctuated::<syn::LitStr, Token![,]>::parse_terminated(&paths)?;
             let values = paths.iter().map(|s| s.value()).collect::<Vec<_>>();
             let mut interfaces = Vec::new();
+            let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
             for value in &values {
+                let value = manifest_dir.join(value);
                 let interface =
                     Interface::parse_file(value).map_err(|e| Error::new(bracket.span, e))?;
                 interfaces.push(interface);
diff --git a/crates/test-modules/modules/crates/flags-main/src/main.rs b/crates/test-modules/modules/crates/flags-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/flags/flags.wit");
+wit_bindgen_rust::import!("../flags/flags.wit");
 
 use flags::*;
 
diff --git a/crates/test-modules/modules/crates/flags/src/lib.rs b/crates/test-modules/modules/crates/flags/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/flags/flags.wit");
+wit_bindgen_rust::export!("flags.wit");
 
 use flags::*;
 
diff --git a/crates/test-modules/modules/crates/lists-main/src/main.rs b/crates/test-modules/modules/crates/lists-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/lists/lists.wit");
+wit_bindgen_rust::import!("../lists/lists.wit");
 
 use lists::*;
 
diff --git a/crates/test-modules/modules/crates/lists/src/lib.rs b/crates/test-modules/modules/crates/lists/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/lists/lists.wit");
+wit_bindgen_rust::export!("lists.wit");
 
 use lists::*;
 
diff --git a/crates/test-modules/modules/crates/nested-main/src/main.rs b/crates/test-modules/modules/crates/nested-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/nested_b/nested_b.wit");
+wit_bindgen_rust::import!("../nested_b/nested_b.wit");
 
 use nested_b::*;
 
diff --git a/crates/test-modules/modules/crates/nested_a/src/lib.rs b/crates/test-modules/modules/crates/nested_a/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/nested_a/nested_a.wit");
+wit_bindgen_rust::export!("nested_a.wit");
 
 struct NestedA;
 
diff --git a/crates/test-modules/modules/crates/nested_b/src/lib.rs b/crates/test-modules/modules/crates/nested_b/src/lib.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("crates/nested_a/nested_a.wit");
-wit_bindgen_rust::export!("crates/nested_b/nested_b.wit");
+wit_bindgen_rust::import!("../nested_a/nested_a.wit");
+wit_bindgen_rust::export!("nested_b.wit");
 
 struct NestedB;
 
diff --git a/crates/test-modules/modules/crates/records-main/src/main.rs b/crates/test-modules/modules/crates/records-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/records/records.wit");
+wit_bindgen_rust::import!("../records/records.wit");
 
 use records::*;
 
diff --git a/crates/test-modules/modules/crates/records/src/lib.rs b/crates/test-modules/modules/crates/records/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/records/records.wit");
+wit_bindgen_rust::export!("records.wit");
 
 use records::*;
 
diff --git a/crates/test-modules/modules/crates/resources-invalid-main/src/main.rs b/crates/test-modules/modules/crates/resources-invalid-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/resources/resources.wit");
+wit_bindgen_rust::import!("../resources/resources.wit");
 
 use resources::*;
 
diff --git a/crates/test-modules/modules/crates/resources-main/src/main.rs b/crates/test-modules/modules/crates/resources-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/resources/resources.wit");
+wit_bindgen_rust::import!("../resources/resources.wit");
 
 use resources::*;
 
diff --git a/crates/test-modules/modules/crates/resources/src/lib.rs b/crates/test-modules/modules/crates/resources/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/resources/resources.wit");
+wit_bindgen_rust::export!("resources.wit");
 
 use std::sync::{Arc, Mutex};
 use wit_bindgen_rust::Handle;
diff --git a/crates/test-modules/modules/crates/types-main/src/main.rs b/crates/test-modules/modules/crates/types-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/types/types.wit");
+wit_bindgen_rust::import!("../types/types.wit");
 
 fn main() {
     types::a();
diff --git a/crates/test-modules/modules/crates/types/src/lib.rs b/crates/test-modules/modules/crates/types/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/types/types.wit");
+wit_bindgen_rust::export!("types.wit");
 
 struct Types;
 
diff --git a/crates/test-modules/modules/crates/variants-main/src/main.rs b/crates/test-modules/modules/crates/variants-main/src/main.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::import!("crates/variants/variants.wit");
+wit_bindgen_rust::import!("../variants/variants.wit");
 
 use variants::*;
 
diff --git a/crates/test-modules/modules/crates/variants/src/lib.rs b/crates/test-modules/modules/crates/variants/src/lib.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("crates/variants/variants.wit");
+wit_bindgen_rust::export!("variants.wit");
 
 use variants::*;
 
diff --git a/crates/wasmtime-impl/src/lib.rs b/crates/wasmtime-impl/src/lib.rs
@@ -1,3 +1,5 @@
+use std::path::{Path, PathBuf};
+
 use proc_macro::TokenStream;
 use syn::parse::{Error, Parse, ParseStream, Result};
 use syn::punctuated::Punctuated;
@@ -36,12 +38,12 @@ fn run(input: TokenStream, dir: Direction) -> TokenStream {
 
     // Include a dummy `include_str!` for any files we read so rustc knows that
     // we depend on the contents of those files.
-    let cwd = std::env::current_dir().unwrap();
+    let cwd = std::env::var("CARGO_MANIFEST_DIR").unwrap();
     for file in input.files.iter() {
         contents.extend(
             format!(
                 "const _: &str = include_str!(r#\"{}\"#);\n",
-                cwd.join(file).display()
+                Path::new(&cwd).join(file).display()
             )
             .parse::<TokenStream>()
             .unwrap(),
@@ -95,7 +97,9 @@ impl Parse for Opts {
                 files.push(s.value());
             }
             let mut interfaces = Vec::new();
+            let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
             for path in files.iter() {
+                let path = manifest_dir.join(path);
                 let iface = Interface::parse_file(path).map_err(|e| Error::new(call_site, e))?;
                 interfaces.push(iface);
             }
@@ -136,7 +140,9 @@ impl Parse for ConfigField {
             let paths = Punctuated::<syn::LitStr, Token![,]>::parse_terminated(&paths)?;
             let values = paths.iter().map(|s| s.value()).collect::<Vec<_>>();
             let mut interfaces = Vec::new();
+            let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
             for value in &values {
+                let value = manifest_dir.join(value);
                 let interface =
                     Interface::parse_file(value).map_err(|e| Error::new(bracket.span, e))?;
                 interfaces.push(interface);
diff --git a/crates/wit-bindgen-demo/src/lib.rs b/crates/wit-bindgen-demo/src/lib.rs
@@ -4,8 +4,8 @@ use wit_bindgen_gen_core::wit_parser::Interface;
 use wit_bindgen_gen_core::Generator;
 use wit_bindgen_rust::Handle;
 
-wit_bindgen_rust::export!("./crates/wit-bindgen-demo/demo.wit");
-wit_bindgen_rust::import!("./crates/wit-bindgen-demo/browser.wit");
+wit_bindgen_rust::export!("demo.wit");
+wit_bindgen_rust::import!("browser.wit");
 
 struct Demo;
 
diff --git a/tests/runtime/async_functions/wasm.rs b/tests/runtime/async_functions/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/async_functions/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/async_functions/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/async_functions/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/async_functions/exports.wit");
 
 struct Exports;
 
diff --git a/tests/runtime/buffers/host.rs b/tests/runtime/buffers/host.rs
@@ -1,4 +1,4 @@
-wit_bindgen_wasmtime::export!("./tests/runtime/buffers/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/buffers/imports.wit");
 
 use anyhow::Result;
 use imports::*;
@@ -115,7 +115,7 @@ impl Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/buffers/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/buffers/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/buffers/wasm.rs b/tests/runtime/buffers/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/buffers/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/buffers/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/buffers/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/buffers/exports.wit");
 
 use std::iter;
 
diff --git a/tests/runtime/flavorful/host.rs b/tests/runtime/flavorful/host.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-wit_bindgen_wasmtime::export!("./tests/runtime/flavorful/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/flavorful/imports.wit");
 
 use imports::*;
 
@@ -91,7 +91,7 @@ impl Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/flavorful/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/flavorful/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/flavorful/wasm.rs b/tests/runtime/flavorful/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/flavorful/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/flavorful/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/flavorful/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/flavorful/exports.wit");
 
 use exports::*;
 
diff --git a/tests/runtime/handles/host.rs b/tests/runtime/handles/host.rs
@@ -1,4 +1,4 @@
-wit_bindgen_wasmtime::export!("./tests/runtime/handles/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/handles/imports.wit");
 
 use anyhow::Result;
 use imports::*;
@@ -87,7 +87,7 @@ impl Imports for MyImports {
     fn odd_name_frob_the_odd(&mut self, _: &()) {}
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/handles/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/handles/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/handles/wasm.rs b/tests/runtime/handles/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/handles/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/handles/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/handles/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/handles/exports.wit");
 
 use exports::*;
 use std::cell::RefCell;
diff --git a/tests/runtime/invalid/host.rs b/tests/runtime/invalid/host.rs
@@ -1,4 +1,4 @@
-wit_bindgen_wasmtime::export!("./tests/runtime/invalid/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/invalid/imports.wit");
 
 use anyhow::Result;
 use imports::*;
@@ -36,7 +36,7 @@ impl Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/invalid/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/invalid/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/invalid/wasm.rs b/tests/runtime/invalid/wasm.rs
@@ -1,4 +1,4 @@
-wit_bindgen_rust::export!("./tests/runtime/invalid/exports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/invalid/exports.wit");
 
 #[link(wasm_import_module = "imports")]
 extern "C" {
diff --git a/tests/runtime/lists/host.rs b/tests/runtime/lists/host.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-wit_bindgen_wasmtime::export!("./tests/runtime/lists/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/lists/imports.wit");
 
 use imports::*;
 use wit_bindgen_wasmtime::Le;
@@ -126,7 +126,7 @@ impl Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/lists/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/lists/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/lists/wasm.rs b/tests/runtime/lists/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/lists/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/lists/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/lists/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/lists/exports.wit");
 
 use std::alloc::{self, Layout};
 use std::mem;
diff --git a/tests/runtime/numbers/host.rs b/tests/runtime/numbers/host.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-wit_bindgen_wasmtime::export!("./tests/runtime/numbers/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/numbers/imports.wit");
 
 #[derive(Default)]
 pub struct MyImports {
@@ -61,7 +61,7 @@ impl imports::Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/numbers/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/numbers/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     let (exports, mut store) = crate::instantiate(
diff --git a/tests/runtime/numbers/wasm.rs b/tests/runtime/numbers/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/numbers/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/numbers/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/numbers/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/numbers/exports.wit");
 
 use imports::*;
 use std::sync::atomic::{AtomicU32, Ordering::SeqCst};
diff --git a/tests/runtime/records/host.rs b/tests/runtime/records/host.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-wit_bindgen_wasmtime::export!("./tests/runtime/records/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/records/imports.wit");
 
 use imports::*;
 
@@ -49,7 +49,7 @@ impl Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/records/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/records/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     use exports::*;
diff --git a/tests/runtime/records/wasm.rs b/tests/runtime/records/wasm.rs
@@ -1,5 +1,5 @@
-wit_bindgen_rust::import!("./tests/runtime/records/imports.wit");
-wit_bindgen_rust::export!("./tests/runtime/records/exports.wit");
+wit_bindgen_rust::import!("../../tests/runtime/records/imports.wit");
+wit_bindgen_rust::export!("../../tests/runtime/records/exports.wit");
 
 use exports::*;
 
@@ -27,7 +27,10 @@ impl exports::Exports for Exports {
             (Flag8::B0, Flag16::B1, Flag32::B2, Flag64::B3)
         );
 
-        let r = roundtrip_record1(R1 { a: 8, b: F1::empty() });
+        let r = roundtrip_record1(R1 {
+            a: 8,
+            b: F1::empty(),
+        });
         assert_eq!(r.a, 8);
         assert_eq!(r.b, F1::empty());
 
diff --git a/tests/runtime/smoke/host.rs b/tests/runtime/smoke/host.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-wit_bindgen_wasmtime::export!("./tests/runtime/smoke/imports.wit");
+wit_bindgen_wasmtime::export!("../../tests/runtime/smoke/imports.wit");
 
 #[derive(Default)]
 pub struct MyImports {
@@ -14,7 +14,7 @@ impl imports::Imports for MyImports {
     }
 }
 
-wit_bindgen_wasmtime::import!("./tests/runtime/smoke/exports.wit");
+wit_bindgen_wasmtime::import!("../../tests/runtime/smoke/exports.wit");
 
 fn run(wasm: &str) -> Result<()> {
     let (exports, mut store) = crate::instantiate(
diff --git a/tests/runtime/smoke/wasm.rs b/tests/runtime/smoke/wasm.rs
diff --git a/tests/runtime/smw_functions/host.rs b/tests/runtime/smw_functions/host.rs
diff --git a/tests/runtime/smw_lists/host.rs b/tests/runtime/smw_lists/host.rs
diff --git a/tests/runtime/smw_strings/host.rs b/tests/runtime/smw_strings/host.rs
diff --git a/tests/runtime/variants/host.rs b/tests/runtime/variants/host.rs
diff --git a/tests/runtime/variants/wasm.rs b/tests/runtime/variants/wasm.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::import!("crates/flags/flags.wit");`
	`1`	`+wit_bindgen_rust::import!("../flags/flags.wit");`
`2`	`2`
`3`	`3`	`use flags::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::export!("crates/flags/flags.wit");`
	`1`	`+wit_bindgen_rust::export!("flags.wit");`
`2`	`2`
`3`	`3`	`use flags::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::import!("crates/lists/lists.wit");`
	`1`	`+wit_bindgen_rust::import!("../lists/lists.wit");`
`2`	`2`
`3`	`3`	`use lists::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::export!("crates/lists/lists.wit");`
	`1`	`+wit_bindgen_rust::export!("lists.wit");`
`2`	`2`
`3`	`3`	`use lists::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::import!("crates/nested_b/nested_b.wit");`
	`1`	`+wit_bindgen_rust::import!("../nested_b/nested_b.wit");`
`2`	`2`
`3`	`3`	`use nested_b::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::export!("crates/nested_a/nested_a.wit");`
	`1`	`+wit_bindgen_rust::export!("nested_a.wit");`
`2`	`2`
`3`	`3`	`struct NestedA;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::import!("crates/records/records.wit");`
	`1`	`+wit_bindgen_rust::import!("../records/records.wit");`
`2`	`2`
`3`	`3`	`use records::*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wit_bindgen_rust::export!("crates/records/records.wit");`
	`1`	`+wit_bindgen_rust::export!("records.wit");`
`2`	`2`
`3`	`3`	`use records::*;`
`4`	`4`