foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 15:24:46 -05:00
Code Issues Packages 1 Wiki Activity

Fix a bug that copyFile reports different error codes

Browse source 
This is a workaroud. Once the issue is resolved in Rust side, we should
remove it.

Fixes #895
This commit is contained in:
Jinho Bang 2018-10-17 14:40:03 +09:00 committed by Ryan Dahl
parent d4afbe6ef3
commit 32f0797128
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
js/copy_file_test.ts
View file

@ -43,15 +43,8 @@ testPerm({ write: true }, function copyFileSyncFailure() {
err = e;
}
assert(!!err);
if (deno.platform.os === "win") {
assertEqual(err.kind, deno.ErrorKind.NotFound);
assertEqual(err.name, "NotFound");
} else {
// On *nix, Rust deem non-existent path as invalid input
// See https://github.com/rust-lang/rust/issues/54800
assertEqual(err.kind, deno.ErrorKind.InvalidInput);
assertEqual(err.name, "InvalidInput");
}
});
testPerm({ write: true }, function copyFileSyncOverwrite() {
@ -104,15 +97,8 @@ testPerm({ write: true }, async function copyFileFailure() {
err = e;
}
assert(!!err);
if (deno.platform.os === "win") {
assertEqual(err.kind, deno.ErrorKind.NotFound);
assertEqual(err.name, "NotFound");
} else {
// On *nix, Rust deem non-existent path as invalid input
// See https://github.com/rust-lang/rust/issues/54800
assertEqual(err.kind, deno.ErrorKind.InvalidInput);
assertEqual(err.name, "InvalidInput");
}
});
testPerm({ write: true }, async function copyFileOverwrite() {

10
src/ops.rs
View file

@ -811,6 +811,16 @@ fn op_copy_file(
debug!("op_copy_file {} {}", from.display(), to.display());
blocking!(base.sync(), || {
// On *nix, Rust deem non-existent path as invalid input
// See https://github.com/rust-lang/rust/issues/54800
// Once the issue is reolved, we should remove this workaround.
if cfg!(unix) && !from.is_file() {
return Err(errors::new(
ErrorKind::NotFound,
"File not found".to_string(),
));
}
fs::copy(&from, &to)?;
Ok(empty_buf())
})