Merge pull request #698 from denoland/main

GulajavaMinistudio · web-flow · commit 32e90ad6a6c5 · 2024-10-10T15:42:04.000+07:00
Create a new pull request by comparing changes across two branches
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -52,7 +52,7 @@ deno_bench_util = { version = "0.165.0", path = "./bench_util" }
 deno_lockfile = "=0.23.1"
 deno_media_type = { version = "0.1.4", features = ["module_specifier"] }
 deno_npm = "=0.25.3"
-deno_path_util = "=0.2.0"
+deno_path_util = "=0.2.1"
 deno_permissions = { version = "0.31.0", path = "./runtime/permissions" }
 deno_runtime = { version = "0.180.0", path = "./runtime" }
 deno_semver = "=0.5.14"
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
@@ -5150,6 +5150,8 @@ fn emit_failed_readonly_file_system() {
   output.assert_matches_text("[WILDCARD]Error saving emit data ([WILDLINE]main.ts)[WILDCARD]Skipped emit cache save of [WILDLINE]other.ts[WILDCARD]hi[WILDCARD]");
 }
 
+// todo(dsherret): waiting on fix in https://github.com/servo/rust-url/issues/505
+#[ignore]
 #[cfg(windows)]
 #[test]
 fn handle_invalid_path_error() {

Original file line number	Diff line number	Diff line change
`@@ -5150,6 +5150,8 @@ fn emit_failed_readonly_file_system() {`
`5150`	`5150`	`output.assert_matches_text("[WILDCARD]Error saving emit data ([WILDLINE]main.ts)[WILDCARD]Skipped emit cache save of [WILDLINE]other.ts[WILDCARD]hi[WILDCARD]");`
`5151`	`5151`	`}`
`5152`	`5152`
	`5153`	`+// todo(dsherret): waiting on fix in https://github.com/servo/rust-url/issues/505`
	`5154`	`+#[ignore]`
`5153`	`5155`	`#[cfg(windows)]`
`5154`	`5156`	`#[test]`
`5155`	`5157`	`fn handle_invalid_path_error() {`