diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2019-07-31 13:58:41 +0200 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2019-07-31 11:58:41 +0000 |
| commit | 421cbd39b4f0fdbdfc2eeed6da8dd3410246a044 (patch) | |
| tree | add5b11671f8275323ab9d159962a9065d5ff8aa /cli/main.rs | |
| parent | ef63ec763a142f1e96e12e21d27ffae439f84ffd (diff) | |
factor out FileFetcher to separate module (#2683)
* merge SourceFileFetcher trait and FileFetcher struct
* move logic related to source file fetching to //cli/file_fetcher.rs
* use Result when creating new ThreadSafeState
Diffstat (limited to 'cli/main.rs')
| -rw-r--r-- | cli/main.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/main.rs b/cli/main.rs index 26bd810c8..8dbd27e54 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -22,6 +22,7 @@ pub mod deno_error; pub mod diagnostics; mod disk_cache; mod dispatch_minimal; +mod file_fetcher; pub mod flags; pub mod fmt_errors; mod fs; @@ -47,7 +48,6 @@ mod tokio_write; pub mod version; pub mod worker; -use crate::deno_dir::SourceFileFetcher; use crate::progress::Progress; use crate::state::ThreadSafeState; use crate::worker::Worker; @@ -107,7 +107,7 @@ pub fn print_file_info( let module_specifier_ = module_specifier.clone(); state_ - .dir + .file_fetcher .fetch_source_file_async(&module_specifier) .map_err(|err| println!("{}", err)) .and_then(move |out| { @@ -191,7 +191,8 @@ fn create_worker_and_state( s.status(status, msg).expect("shell problem"); } }); - let state = ThreadSafeState::new(flags, argv, ops::op_selector_std, progress); + let state = + ThreadSafeState::new(flags, argv, ops::op_selector_std, progress).unwrap(); let worker = Worker::new( "main".to_string(), startup_data::deno_isolate_init(), |