fix: incremental build on windows get_res_path_from_ast

Author: Bushuo

rewatch/src/build/build_types.rs

@@ -136,6 +136,7 @@ impl BuildState {
     }
 }
 
+#[derive(Debug)]
 pub struct AstModule {
     pub module_name: String,
     pub package_name: String,
@@ -146,6 +147,7 @@ pub struct AstModule {
     pub suffix: String,
 }
 
+#[derive(Debug)]
 pub struct CompileAssetsState {
     pub ast_modules: AHashMap<PathBuf, AstModule>,
     pub cmi_modules: AHashMap<String, SystemTime>,

rewatch/src/build/read_compile_state.rs

@@ -79,13 +79,11 @@ pub fn read(build_state: &mut BuildState) -> CompileAssetsState {
                 "iast" | "ast" => {
                     let module_name = helpers::file_path_to_module_name(path, package_namespace);
 
-                    let res_file_path = get_res_path_from_ast(&path);
                     let root_package = build_state
                         .packages
                         .get(&build_state.root_config_name)
                         .expect("Could not find root package");
-                    if let Some(res_file_path) = res_file_path {
-                        let res_file_path_buf = PathBuf::from(res_file_path);
+                    if let Some(res_file_path_buf) = get_res_path_from_ast(&path) {
                         let _ = ast_modules.insert(
                             res_file_path_buf.clone(),
                             AstModule {
@@ -137,15 +135,15 @@ pub fn read(build_state: &mut BuildState) -> CompileAssetsState {
     }
 }
 
-fn get_res_path_from_ast(ast_file: &Path) -> Option<String> {
+fn get_res_path_from_ast(ast_file: &Path) -> Option<PathBuf> {
     if let Ok(lines) = helpers::read_lines(ast_file) {
         // we skip the first line with is some null characters
         // the following lines in the AST are the dependency modules
-        // we stop when we hit a line that starts with a "/", this is the path of the file.
+        // we stop when we hit a line that is an absolute path, this is the path of the file.
         // this is the point where the dependencies end and the actual AST starts
         for line in lines.skip(1) {
             match line {
-                Ok(line) if line.trim_start().starts_with('/') => return Some(line),
+                Ok(line) if Path::new(&line).is_absolute() => return Some(PathBuf::from(line)),
                 _ => (),
             }
         }

rewatch/src/helpers.rs

@@ -75,7 +75,7 @@ impl StrippedVerbatimPath for PathBuf {
                     stripped.push(Component::ParentDir);
                 }
                 Component::Normal(os_str) => {
-                    stripped.push(os_str);
+                    stripped.push(Component::Normal(os_str));
                 }
             }
         }