Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-30 08:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #462 from Demonthos/fix_hot_reload_paths

Browse source 
fix path separator for hot reloading
This commit is contained in:
Demonthos 2022-06-29 12:24:14 -05:00 committed by GitHub
commit 7f5ad96c0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/rsx_interpreter/src/lib.rs
View file

@ -24,7 +24,8 @@ lazy_static! {
// the location of the code relative to the current crate based on [std::panic::Location] // the location of the code relative to the current crate based on [std::panic::Location]
#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
pub struct CodeLocation { pub struct CodeLocation {
pub file: String, pub crate_path: String,
pub file_path: String,
pub line: u32, pub line: u32,
pub column: u32, pub column: u32,
} }
@ -83,14 +84,12 @@ macro_rules! get_line_num {
() => {{ () => {{
let line = line!(); let line = line!();
let column = column!(); 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 { CodeLocation {
file: file.to_string(), crate_path,
file_path,
line: line, line: line,
column: column, column: column,
} }

18
packages/rsx_interpreter/tests/render.rs
View file

@ -10,7 +10,8 @@ fn render_basic() {
let dom = VirtualDom::new(Base); let dom = VirtualDom::new(Base);
let static_vnodes = rsx!(div{"hello world"}); let static_vnodes = rsx!(div{"hello world"});
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 0, line: 0,
column: 0, column: 0,
}; };
@ -55,7 +56,8 @@ fn render_nested() {
} }
}; };
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 1, line: 1,
column: 0, column: 0,
}; };
@ -106,7 +108,8 @@ fn render_component() {
} }
}; };
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 2, line: 2,
column: 0, column: 0,
}; };
@ -157,7 +160,8 @@ fn render_iterator() {
} }
}; };
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 3, line: 3,
column: 0, column: 0,
}; };
@ -210,7 +214,8 @@ fn render_captured_variable() {
} }
}; };
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 4, line: 4,
column: 0, column: 0,
}; };
@ -261,7 +266,8 @@ fn render_listener() {
} }
}; };
let location = CodeLocation { let location = CodeLocation {
file: String::new(), file_path: String::new(),
crate_path: String::new(),
line: 5, line: 5,
column: 0, column: 0,
}; };