From 69f73ee368e07e6e11301c0ab4c42444e92ed635 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 8 Aug 2018 15:49:00 -0400 Subject: [PATCH] Hacky error handling for Url::from_file_path. --- src/deno_dir.rs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/deno_dir.rs b/src/deno_dir.rs index b3a4c029b0..cabd9ed920 100644 --- a/src/deno_dir.rs +++ b/src/deno_dir.rs @@ -165,12 +165,27 @@ impl DenoDir { let j: Url = if containing_file == "." || Path::new(module_specifier).is_absolute() { - Url::from_file_path(module_specifier).unwrap() + let r = Url::from_file_path(module_specifier); + // TODO(ry) Properly handle error. + if r.is_err() { + error!("Url::from_file_path error {}", module_specifier); + } + r.unwrap() } else if containing_file.ends_with("/") { - let base = Url::from_directory_path(&containing_file).unwrap(); + let r = Url::from_directory_path(&containing_file); + // TODO(ry) Properly handle error. + if r.is_err() { + error!("Url::from_directory_path error {}", containing_file); + } + let base = r.unwrap(); base.join(module_specifier)? } else { - let base = Url::from_file_path(&containing_file).unwrap(); + let r = Url::from_file_path(&containing_file); + // TODO(ry) Properly handle error. + if r.is_err() { + error!("Url::from_file_path error {}", containing_file); + } + let base = r.unwrap(); base.join(module_specifier)? };