[red-knot] Use POSIX representations of paths when creating the types…

…hed zip file (#11982)

crates/red_knot_module_resolver/Cargo.toml

@@ -21,6 +21,7 @@ tracing = { workspace = true }
 zip = { workspace = true }
 
 [build-dependencies]
+path-slash = { workspace = true }
 walkdir = { workspace = true }
 zip = { workspace = true }
 

crates/red_knot_module_resolver/build.rs

@@ -8,6 +8,7 @@
 use std::fs::File;
 use std::path::Path;
 
+use path_slash::PathExt;
 use zip::result::ZipResult;
 use zip::write::{FileOptions, ZipWriter};
 use zip::CompressionMethod;
@@ -28,25 +29,25 @@ fn zip_dir(directory_path: &str, writer: File) -> ZipResult<File> {
 
     for entry in walkdir::WalkDir::new(directory_path) {
         let dir_entry = entry.unwrap();
-        let relative_path = dir_entry.path();
-        let name = relative_path
+        let absolute_path = dir_entry.path();
+        let normalized_relative_path = absolute_path
             .strip_prefix(Path::new(directory_path))
             .unwrap()
-            .to_str()
+            .to_slash()
             .expect("Unexpected non-utf8 typeshed path!");
 
         // Write file or directory explicitly
         // Some unzip tools unzip files with directory paths correctly, some do not!
-        if relative_path.is_file() {
-            println!("adding file {relative_path:?} as {name:?} ...");
-            zip.start_file(name, options)?;
-            let mut f = File::open(relative_path)?;
+        if absolute_path.is_file() {
+            println!("adding file {absolute_path:?} as {normalized_relative_path:?} ...");
+            zip.start_file(normalized_relative_path, options)?;
+            let mut f = File::open(absolute_path)?;
             std::io::copy(&mut f, &mut zip).unwrap();
-        } else if !name.is_empty() {
+        } else if !normalized_relative_path.is_empty() {
             // Only if not root! Avoids path spec / warning
             // and mapname conversion failed error on unzip
-            println!("adding dir {relative_path:?} as {name:?} ...");
-            zip.add_directory(name, options)?;
+            println!("adding dir {absolute_path:?} as {normalized_relative_path:?} ...");
+            zip.add_directory(normalized_relative_path, options)?;
         }
     }
     zip.finish()

crates/red_knot_module_resolver/src/typeshed.rs

@@ -3,7 +3,6 @@ pub(crate) mod versions;
 #[cfg(test)]
 mod tests {
     use std::io::{self, Read};
-    use std::path::Path;
 
     #[test]
     fn typeshed_zip_created_at_build_time() -> anyhow::Result<()> {
@@ -14,9 +13,8 @@ mod tests {
 
         let mut typeshed_zip_archive = zip::ZipArchive::new(io::Cursor::new(TYPESHED_ZIP_BYTES))?;
 
-        let path_to_functools = Path::new("stdlib").join("functools.pyi");
         let mut functools_module_stub = typeshed_zip_archive
-            .by_name(path_to_functools.to_str().unwrap())
+            .by_name("stdlib/functools.pyi")
             .unwrap();
         assert!(functools_module_stub.is_file());