From 884723831bb677e5c28bdce74ddd54036363096e Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Tue, 28 Jun 2022 09:48:19 -0500 Subject: [PATCH] fix path seperator --- packages/rsx_interpreter/src/lib.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/rsx_interpreter/src/lib.rs b/packages/rsx_interpreter/src/lib.rs index 8f74ce29b..cfda4c2ed 100644 --- a/packages/rsx_interpreter/src/lib.rs +++ b/packages/rsx_interpreter/src/lib.rs @@ -24,7 +24,8 @@ lazy_static! { // the location of the code relative to the current crate based on [std::panic::Location] #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)] pub struct CodeLocation { - pub file: String, + pub crate_path: String, + pub file_path: String, pub line: u32, pub column: u32, } @@ -83,14 +84,12 @@ macro_rules! get_line_num { () => {{ let line = line!(); let column = column!(); - let file = file!(); + let file_path = file!().to_string(); + let mut crate_path = env!("CARGO_MANIFEST_DIR").to_string(); - #[cfg(windows)] - let file = env!("CARGO_MANIFEST_DIR").to_string() + "\\" + file!(); - #[cfg(unix)] - let file = env!("CARGO_MANIFEST_DIR").to_string() + "/" + file!(); CodeLocation { - file: file.to_string(), + crate_path, + file_path, line: line, column: column, }