Merge pull request #462 from Demonthos/fix_hot_reload_paths

fix path separator for hot reloading
This commit is contained in:
Demonthos authored and GitHub committed 2022-06-29 12:24:14 -05:00
commit 7f5ad96c0b
2 files changed
+18 -13

No files matched your search

+6 -7
View File
@@ -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 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,
}