diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-02-26 05:52:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-26 11:52:15 +0100 |
commit | 9a8d6fbd984d2c0f9775d90af64b3e95231dd21d (patch) | |
tree | 12112b2114a8c739ae741357fde873f522bf7180 /cli/lib.rs | |
parent | 3eebef39c55ead92d17bdf8016c3c58118b49936 (diff) |
DenoFlags -> Flags (#4136)
Diffstat (limited to 'cli/lib.rs')
-rw-r--r-- | cli/lib.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/cli/lib.rs b/cli/lib.rs index 3fa019d3e..32d583a22 100644 --- a/cli/lib.rs +++ b/cli/lib.rs @@ -65,8 +65,8 @@ use crate::worker::MainWorker; use deno_core::v8_set_flags; use deno_core::ErrBox; use deno_core::ModuleSpecifier; -use flags::DenoFlags; use flags::DenoSubcommand; +use flags::Flags; use futures::future::FutureExt; use log::Level; use log::Metadata; @@ -219,7 +219,7 @@ async fn print_file_info( } async fn info_command( - flags: DenoFlags, + flags: Flags, file: Option<String>, ) -> Result<(), ErrBox> { let global_state = GlobalState::new(flags)?; @@ -236,7 +236,7 @@ async fn info_command( } async fn install_command( - flags: DenoFlags, + flags: Flags, dir: Option<PathBuf>, exe_name: String, module_url: String, @@ -254,10 +254,7 @@ async fn install_command( .map_err(ErrBox::from) } -async fn fetch_command( - flags: DenoFlags, - files: Vec<String>, -) -> Result<(), ErrBox> { +async fn fetch_command(flags: Flags, files: Vec<String>) -> Result<(), ErrBox> { let main_module = ModuleSpecifier::resolve_url_or_path("./__$deno$fetch.ts").unwrap(); let global_state = GlobalState::new(flags)?; @@ -282,7 +279,7 @@ async fn fetch_command( Ok(()) } -async fn eval_command(flags: DenoFlags, code: String) -> Result<(), ErrBox> { +async fn eval_command(flags: Flags, code: String) -> Result<(), ErrBox> { // Force TypeScript compile. let main_module = ModuleSpecifier::resolve_url_or_path("./__$deno$eval.ts").unwrap(); @@ -297,7 +294,7 @@ async fn eval_command(flags: DenoFlags, code: String) -> Result<(), ErrBox> { } async fn bundle_command( - flags: DenoFlags, + flags: Flags, source_file: String, out_file: Option<PathBuf>, ) -> Result<(), ErrBox> { @@ -312,7 +309,7 @@ async fn bundle_command( bundle_result } -async fn run_repl(flags: DenoFlags) -> Result<(), ErrBox> { +async fn run_repl(flags: Flags) -> Result<(), ErrBox> { let main_module = ModuleSpecifier::resolve_url_or_path("./__$deno$repl.ts").unwrap(); let global_state = GlobalState::new(flags)?; @@ -322,7 +319,7 @@ async fn run_repl(flags: DenoFlags) -> Result<(), ErrBox> { } } -async fn run_command(flags: DenoFlags, script: String) -> Result<(), ErrBox> { +async fn run_command(flags: Flags, script: String) -> Result<(), ErrBox> { let global_state = GlobalState::new(flags.clone())?; let main_module = ModuleSpecifier::resolve_url_or_path(&script).unwrap(); let mut worker = @@ -345,7 +342,7 @@ async fn run_command(flags: DenoFlags, script: String) -> Result<(), ErrBox> { } async fn test_command( - flags: DenoFlags, + flags: Flags, include: Option<Vec<String>>, fail_fast: bool, _quiet: bool, |