From f4f1684db3e8c7678a3081db61b83fbd68310b76 Mon Sep 17 00:00:00 2001
From: Duncan Fairbanks <duncanfairbanks6@gmail.com>
Date: Sat, 4 Nov 2023 19:40:42 -0700
Subject: [PATCH] fix: use Path API for AssetPath manipulation in embedded_path
 macro

Path manipulation is far less error prone when using the std::path::Path
API. This lets us remove all instances of "/" which is not a portable
path separator.
---
 crates/bevy_asset/src/io/embedded/mod.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/bevy_asset/src/io/embedded/mod.rs b/crates/bevy_asset/src/io/embedded/mod.rs
index e5470cd3d5c3f3..6370f09348970b 100644
--- a/crates/bevy_asset/src/io/embedded/mod.rs
+++ b/crates/bevy_asset/src/io/embedded/mod.rs
@@ -104,16 +104,16 @@ impl EmbeddedAssetRegistry {
 #[macro_export]
 macro_rules! embedded_path {
     ($path_str: expr) => {{
-        embedded_path!("/src/", $path_str)
+        embedded_path!("src", $path_str)
     }};
 
     ($source_path: expr, $path_str: expr) => {{
         let crate_name = module_path!().split(':').next().unwrap();
-        let after_src = file!().split($source_path).nth(1).unwrap();
-        let file_path = std::path::Path::new(after_src)
-            .parent()
-            .unwrap()
-            .join($path_str);
+        let file_path = std::path::Path::new(file!());
+        let after_src = file_path
+            .strip_prefix($source_path)
+            .unwrap_or_else(|_| panic!("{file_path:?} does not have prefix {}", $source_path));
+        let file_path = after_src.parent().unwrap().join($path_str);
         std::path::Path::new(crate_name).join(file_path)
     }};
 }
@@ -186,7 +186,7 @@ macro_rules! embedded_path {
 #[macro_export]
 macro_rules! embedded_asset {
     ($app: ident, $path: expr) => {{
-        embedded_asset!($app, "/src/", $path)
+        embedded_asset!($app, "src", $path)
     }};
 
     ($app: ident, $source_path: expr, $path: expr) => {{