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

Make print_file_info async

Browse source
This commit is contained in:
gurv-s 2019-06-08 15:33:04 +05:30 committed by Ryan Dahl
parent 564222bc10
commit 95eac608a6
1 changed files with 48 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cli/main.rs
View file

@ -51,6 +51,7 @@ use flags::DenoFlags;
use flags::DenoSubcommand; use flags::DenoSubcommand;
use futures::lazy; use futures::lazy;
use futures::Future; use futures::Future;
use futures::future;
use log::{LevelFilter, Metadata, Record}; use log::{LevelFilter, Metadata, Record};
use std::env; use std::env;
@ -92,15 +93,15 @@ where
} }
} }
pub fn print_file_info(worker: &Worker, url: &str) { pub fn print_file_info(
let maybe_out = worker: Worker,
state::fetch_module_meta_data_and_maybe_compile(&worker.state, url, "."); url: &str,
if let Err(err) = maybe_out { ) -> impl Future<Item = Worker, Error = ()> {
println!("{}", err); worker::fetch_module_meta_data_and_maybe_compile_async(
return; &worker.state,
} url,
let out = maybe_out.unwrap(); ".",
).and_then(move |out| {
println!("{} {}", ansi::bold("local:".to_string()), &(out.filename)); println!("{} {}", ansi::bold("local:".to_string()), &(out.filename));
println!( println!(
@ -126,7 +127,7 @@ pub fn print_file_info(worker: &Worker, url: &str) {
} }
let modules = worker.modules.lock().unwrap(); let modules = worker.modules.lock().unwrap();
if let Some(deps) = modules.deps(&out.module_name) { if let Some(deps) = worker.modules.deps(&out.module_name) {
println!("{}{}", ansi::bold("deps:\n".to_string()), deps.name); println!("{}{}", ansi::bold("deps:\n".to_string()), deps.name);
if let Some(ref depsdeps) = deps.deps { if let Some(ref depsdeps) = deps.deps {
for d in depsdeps { for d in depsdeps {
@ -139,6 +140,8 @@ pub fn print_file_info(worker: &Worker, url: &str) {
ansi::bold("deps:".to_string()), ansi::bold("deps:".to_string()),
); );
} }
Ok(worker)
}).map_err(|err| println!("{}", err))
} }
fn create_worker_and_state( fn create_worker_and_state(
@ -195,8 +198,11 @@ fn fetch_or_info_command(
.execute_mod_async(&main_url, true) .execute_mod_async(&main_url, true)
.and_then(move |()| { .and_then(move |()| {
if print_info { if print_info {
print_file_info(&worker, &main_module); future::Either::A(print_file_info(worker, &main_module))
} else {
future::Either::B(future::ok(worker))
} }
}).and_then(|worker| {
worker.then(|result| { worker.then(|result| {
js_check(result); js_check(result);
Ok(()) Ok(())