Update Rust crate fs-err to v3 (#8625)

astral-sh · Nov 19, 2024 · dae630a · dae630a
1 parent 07806c4
commit dae630a
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,7 +98,7 @@ either = { version = "1.13.0" }
 encoding_rs_io = { version = "0.1.7" }
 etcetera = { version = "0.8.0" }
 flate2 = { version = "1.0.33", default-features = false }
-fs-err = { version = "2.11.0" }
+fs-err = { version = "3.0.0" }
 fs2 = { version = "0.4.3" }
 futures = { version = "0.3.30" }
 glob = { version = "0.3.1" }

diff --git a/crates/uv-build-backend/Cargo.toml b/crates/uv-build-backend/Cargo.toml
@@ -43,5 +43,5 @@ workspace = true
 
 [dev-dependencies]
 indoc = { version = "2.0.5" }
-insta = { version = "1.40.0" }
+insta = { version = "1.40.0", features = ["filters"] }
 tempfile = { version = "3.12.0" }
diff --git a/crates/uv-build-backend/src/metadata.rs b/crates/uv-build-backend/src/metadata.rs
@@ -1022,8 +1022,15 @@ mod tests {
             .unwrap()
             .to_metadata(Path::new("/do/not/read"))
             .unwrap_err();
-        // Simplified for windows compatibility.
-        assert_snapshot!(err.to_string().replace('\\', "/"), @"failed to open file `/do/not/read/Readme.md`");
+        // Strip away OS specific part.
+        let err = err
+            .to_string()
+            .replace('\\', "/")
+            .split_once(':')
+            .unwrap()
+            .0
+            .to_string();
+        assert_snapshot!(err, @"failed to open file `/do/not/read/Readme.md`");
     }
 
     #[test]

diff --git a/crates/uv-requirements-txt/src/lib.rs b/crates/uv-requirements-txt/src/lib.rs
@@ -1406,13 +1406,19 @@ mod test {
         let filters = vec![
             (requirement_txt.as_str(), "<REQUIREMENTS_TXT>"),
             (missing_txt.as_str(), "<MISSING_TXT>"),
+            // Windows translates error messages, for example i get:
+            // "Das System kann den angegebenen Pfad nicht finden. (os error 3)"
+            (
+                r": .* \(os error 2\)",
+                ": The system cannot find the path specified. (os error 2)",
+            ),
         ];
         insta::with_settings!({
             filters => filters,
         }, {
             insta::assert_snapshot!(errors, @r###"
             Error parsing included file in `<REQUIREMENTS_TXT>` at position 0
-            failed to read from file `<MISSING_TXT>`
+            failed to read from file `<MISSING_TXT>`: The system cannot find the path specified. (os error 2)
             "###);
         });
 

diff --git a/crates/uv-trampoline/Cargo.lock b/crates/uv-trampoline/Cargo.lock
diff --git a/crates/uv-trampoline/Cargo.toml b/crates/uv-trampoline/Cargo.toml
@@ -56,7 +56,7 @@ embed-manifest = "1.4.0"
 anyhow = { version = "1.0.80" }
 assert_cmd = { version = "2.0.14" }
 assert_fs = { version = "1.1.1" }
-fs-err = { version = "2.11.0" }
+fs-err = { version = "3.0.0" }
 thiserror = { version = "2.0.0" }
 which = { version = "7.0.0" }
 zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
diff --git a/crates/uv/tests/it/run.rs b/crates/uv/tests/it/run.rs
@@ -2850,8 +2850,7 @@ fn run_script_explicit_directory() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    error: failed to read from file `script`
-      Caused by: Is a directory (os error 21)
+    error: failed to read from file `script`: Is a directory (os error 21)
     "###);
 
     Ok(())