From d318e38b76c8174d48fddfb99064401050cd8333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 30 Jan 2023 16:22:17 +0100
Subject: Revert "fix(watch): preserve `ProcState::file_fetcher` between
 restarts (#15466) (#17591)

This reverts commit 3545bff678f20c3fdf17fe6b26f96cf1b74f917c.
---
 cli/cache/mod.rs           | 4 +++-
 cli/cache/node.rs          | 1 -
 cli/cache/parsed_source.rs | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'cli/cache')

diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs
index c8fcaa223..a52fe5f48 100644
--- a/cli/cache/mod.rs
+++ b/cli/cache/mod.rs
@@ -50,10 +50,12 @@ pub struct FetchCacher {
 impl FetchCacher {
   pub fn new(
     emit_cache: EmitCache,
-    file_fetcher: Arc<FileFetcher>,
+    file_fetcher: FileFetcher,
     root_permissions: PermissionsContainer,
     dynamic_permissions: PermissionsContainer,
   ) -> Self {
+    let file_fetcher = Arc::new(file_fetcher);
+
     Self {
       emit_cache,
       dynamic_permissions,
diff --git a/cli/cache/node.rs b/cli/cache/node.rs
index b19772229..da17633aa 100644
--- a/cli/cache/node.rs
+++ b/cli/cache/node.rs
@@ -24,7 +24,6 @@ struct CjsAnalysisData {
   pub reexports: Vec<String>,
 }
 
-#[derive(Clone)]
 pub struct NodeAnalysisCache {
   db_file_path: Option<PathBuf>,
   inner: Arc<Mutex<Option<Option<NodeAnalysisCacheInner>>>>,
diff --git a/cli/cache/parsed_source.rs b/cli/cache/parsed_source.rs
index 6385e7384..30eecf702 100644
--- a/cli/cache/parsed_source.rs
+++ b/cli/cache/parsed_source.rs
@@ -67,14 +67,6 @@ impl ParsedSourceCache {
     }
   }
 
-  pub fn reset_for_file_watcher(&self) -> Self {
-    Self {
-      db_cache_path: self.db_cache_path.clone(),
-      cli_version: self.cli_version.clone(),
-      sources: Default::default(),
-    }
-  }
-
   pub fn get_parsed_source_from_module(
     &self,
     module: &deno_graph::Module,
-- 
cgit v1.2.3