foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

Simplify NotFound code.

Browse source
This commit is contained in:
Ryan Dahl 2018-11-15 05:11:42 -05:00
parent 3c8d2bde68
commit d7abdfe754
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/deno_dir.rs
View file

@ -1,6 +1,6 @@
// Copyright 2018 the Deno authors. All rights reserved. MIT license.
use dirs;
use errors::DenoError;
use errors;
use errors::DenoResult;
use errors::ErrorKind;
use fs as deno_fs;
@ -208,7 +208,7 @@ impl DenoDir {
self: &Self,
module_specifier: &str,
containing_file: &str,
) -> Result<CodeFetchOutput, DenoError> {
) -> Result<CodeFetchOutput, errors::DenoError> {
debug!(
"code_fetch. module_specifier {} containing_file {}",
module_specifier, containing_file
@ -219,21 +219,21 @@ impl DenoDir {
let result = self.get_source_code(module_name.as_str(), filename.as_str());
let out = match result {
Ok(out) => out,
Err(err) => {
if err.kind() == ErrorKind::NotFound {
// For NotFound, change the message to something better.
return Err(DenoError::from(std::io::Error::new(
std::io::ErrorKind::NotFound,
return Err(errors::new(
ErrorKind::NotFound,
format!(
"Cannot resolve module \"{}\" from \"{}\"",
module_specifier, containing_file
),
)));
));
} else {
return Err(err);
}
}
Ok(out) => out,
},
};
let result =