Merge pull request #710 from GuillaumeGomez/fix-relative-paths

Fix build determinism and macro path management

Author: GuillaumeGomez

askama_derive/src/generator.rs

@@ -4,7 +4,6 @@ mod helpers;
 mod node;
 
 use std::borrow::Cow;
-use std::env::current_dir;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::str;
@@ -179,10 +178,7 @@ impl<'a, 'h> Generator<'a, 'h> {
         {
             local_file.pop();
             if !local_file.is_absolute() {
-                local_file = current_dir()
-                    .as_deref()
-                    .unwrap_or(Path::new("."))
-                    .join(local_file);
+                local_file = Path::new(".").join(local_file);
             }
 
             self.caller_dir = CallerDir::Valid(clean_path(&local_file));

testing/tests/auxiliary/paths.rs

@@ -0,0 +1 @@
+define_template!();

testing/tests/paths.rs

@@ -0,0 +1,14 @@
+// This test ensures that template paths work even when created from another file.
+#[test]
+fn cross_file_paths() {
+    macro_rules! define_template {
+        () => {
+            #[derive(askama::Template)]
+            #[template(path = "base-decl.txt")]
+            struct Empty {}
+        };
+    }
+
+    #[path = "./auxiliary/paths.rs"]
+    mod a;
+}