From 421cbd39b4f0fdbdfc2eeed6da8dd3410246a044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 31 Jul 2019 13:58:41 +0200
Subject: 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
---
 cli/ops.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'cli/ops.rs')

diff --git a/cli/ops.rs b/cli/ops.rs
index 227bb03b3..7ab3eb870 100644
--- a/cli/ops.rs
+++ b/cli/ops.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 use atty;
 use crate::ansi;
-use crate::deno_dir::SourceFileFetcher;
 use crate::deno_error;
 use crate::deno_error::DenoError;
 use crate::deno_error::ErrorKind;
@@ -506,7 +505,7 @@ fn op_fetch_source_file(
   let resolved_specifier = state.resolve(specifier, referrer, false)?;
 
   let fut = state
-    .dir
+    .file_fetcher
     .fetch_source_file_async(&resolved_specifier)
     .and_then(move |out| {
       let builder = &mut FlatBufferBuilder::new();
@@ -2064,7 +2063,7 @@ fn op_create_worker(
     parent_state.argv.clone(),
     op_selector_std,
     parent_state.progress.clone(),
-  );
+  )?;
   let rid = child_state.resource.rid;
   let name = format!("USER-WORKER-{}", specifier);
 
-- 
cgit v1.2.3