Use PathBuf for DenoSubcommand::Bundle's out_file

nayeemrmn · Feb 10, 2020 · eb5ce24 · eb5ce24
1 parent e8f639c
commit eb5ce24
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs
@@ -166,7 +166,7 @@ fn req(
   request_type: msg::CompilerRequestType,
   root_names: Vec<String>,
   compiler_config: CompilerConfig,
-  out_file: Option<String>,
+  out_file: Option<PathBuf>,
   target: &str,
   bundle: bool,
 ) -> Buf {
@@ -271,7 +271,7 @@ impl TsCompiler {
     &self,
     global_state: GlobalState,
     module_name: String,
-    out_file: Option<String>,
+    out_file: Option<PathBuf>,
   ) -> Result<(), ErrBox> {
     debug!(
       "Invoking the compiler to bundle. module_name: {}",
@@ -743,7 +743,7 @@ mod tests {
       .bundle_async(
         state.clone(),
         module_name,
-        Some(String::from("$deno$/bundle.js")),
+        Some(PathBuf::from("$deno$/bundle.js")),
       )
       .await;
     assert!(result.is_ok());

diff --git a/cli/flags.rs b/cli/flags.rs
@@ -7,7 +7,7 @@ use clap::ArgMatches;
 use clap::SubCommand;
 use log::Level;
 use std::collections::HashSet;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 /// Creates vector of strings, Vec<String>
 macro_rules! svec {
@@ -35,7 +35,7 @@ const TEST_RUNNER_URL: &str = std_url!("testing/runner.ts");
 pub enum DenoSubcommand {
   Bundle {
     source_file: String,
-    out_file: Option<String>,
+    out_file: Option<PathBuf>,
   },
   Completions {
     buf: Box<[u8]>,
@@ -347,7 +347,7 @@ fn bundle_parse(flags: &mut DenoFlags, matches: &clap::ArgMatches) {
 
   let out_file = if let Some(out_file) = matches.value_of("out_file") {
     flags.allow_write = true;
-    Some(out_file.to_string())
+    Some(PathBuf::from(out_file))
   } else {
     None
   };
@@ -1677,7 +1677,7 @@ mod tests {
       DenoFlags {
         subcommand: DenoSubcommand::Bundle {
           source_file: "source.ts".to_string(),
-          out_file: Some("bundle.js".to_string()),
+          out_file: Some(PathBuf::from("bundle.js")),
         },
         allow_write: true,
         ..DenoFlags::default()

diff --git a/cli/lib.rs b/cli/lib.rs
@@ -72,6 +72,7 @@ use log::Level;
 use log::Metadata;
 use log::Record;
 use std::env;
+use std::path::PathBuf;
 
 static LOGGER: Logger = Logger;
 
@@ -331,7 +332,7 @@ async fn eval_command(flags: DenoFlags, code: String) {
 async fn bundle_command(
   flags: DenoFlags,
   source_file: String,
-  out_file: Option<String>,
+  out_file: Option<PathBuf>,
 ) {
   debug!(">>>>> bundle_async START");
   let source_file_specifier =