core: replace ModuleSpecifier::to_url() by as_url()

3 files changed, 9 insertions, 11 deletions

diff --git a/cli/deno_dir.rs b/cli/deno_dir.rs
index 657e6670e..40962d768 100644
--- a/cli/deno_dir.rs
+++ b/cli/deno_dir.rs
@@ -199,8 +199,8 @@ impl DenoDir {
     use_cache: bool,
     no_fetch: bool,
   ) -> impl Future<Item = ModuleMetaData, Error = deno_error::DenoError> {
-    let module_url = specifier.to_url();
-    debug!("fetch_module_meta_data. specifier {} ", module_url);
+    let module_url = specifier.as_url().to_owned();
+    debug!("fetch_module_meta_data. specifier {} ", &module_url);
 
     let result = self.url_to_deps_path(&module_url);
     if let Err(err) = result {
diff --git a/cli/flags.rs b/cli/flags.rs
index b3fc11380..62cd8b7a4 100644
--- a/cli/flags.rs
+++ b/cli/flags.rs
@@ -6,6 +6,7 @@ use clap::ArgMatches;
 use clap::Shell;
 use clap::SubCommand;
 use crate::deno_dir;
+use deno::ModuleSpecifier;
 use log::Level;
 use std;
 use std::str;
@@ -629,14 +630,11 @@ pub enum DenoSubcommand {
 }
 
 fn get_default_bundle_filename(source_file: &str) -> String {
-  use deno::ModuleSpecifier;
-  let url = ModuleSpecifier::resolve_url_or_path(source_file)
-    .unwrap()
-    .to_url();
-  let path_segments = url.path_segments().unwrap();
-  let last = path_segments.last().unwrap();
-  String::from(last.trim_end_matches(".ts").trim_end_matches(".js"))
-    + ".bundle.js"
+  let specifier = ModuleSpecifier::resolve_url_or_path(source_file).unwrap();
+  let path_segments = specifier.as_url().path_segments().unwrap();
+  let file_name = path_segments.last().unwrap();
+  let file_stem = file_name.trim_end_matches(".ts").trim_end_matches(".js");
+  format!("{}.bundle.js", file_stem)
 }
 
 #[test]
diff --git a/cli/import_map.rs b/cli/import_map.rs
index 44525f7a2..1f136a3e9 100644
--- a/cli/import_map.rs
+++ b/cli/import_map.rs
@@ -384,7 +384,7 @@ impl ImportMap {
           let address = address_vec.first().unwrap();
           let after_prefix = &normalized_specifier[specifier_key.len()..];
 
-          let base_url = address.to_url();
+          let base_url = address.as_url();
           if let Ok(url) = base_url.join(after_prefix) {
             debug!("Specifier {:?} was mapped to {:?} (via prefix specifier key {:?}).", normalized_specifier, url, address);
             return Ok(Some(ModuleSpecifier::from(url)));