From 898c4a0c76125b1a36c3514a4736b512f37b277f Mon Sep 17 00:00:00 2001
From: Alex Rawson <ajzecrom@gmail.com>
Date: Fri, 5 Aug 2022 00:13:46 -0500
Subject: [PATCH] Reintroduce include_bytes! macro in expanded code

---
 macros/src/lib.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 1b3683998..51e5b4cf4 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -75,8 +75,17 @@ fn expand_dir(root: &Path, path: &Path) -> proc_macro2::TokenStream {
 }
 
 fn expand_file(root: &Path, path: &Path) -> proc_macro2::TokenStream {
-    let contents = read_file(path);
-    let literal = Literal::byte_string(&contents);
+    let abs = path
+        .canonicalize()
+        .unwrap_or_else(|e| panic!("failed to resolve \"{}\": {}", path.display(), e));
+    let literal = match abs.to_str() {
+        Some(abs) => quote!(include_bytes!(#abs)),
+        None => {
+            let contents = read_file(path);
+            let literal = Literal::byte_string(&contents);
+            quote!(#literal)
+        }
+    };
 
     let normalized_path = normalize_path(root, path);
 
@@ -285,7 +294,7 @@ mod tests {
 
         let resolved = resolve_path(path, |name| match name {
             "TOP_LEVEL" => Some("$NESTED".to_string()),
-            "$NESTED" => unreachable!("Shouln't resolve recursively"),
+            "$NESTED" => unreachable!("Shouldn't resolve recursively"),
             _ => unreachable!(),
         })
         .unwrap();