refactor(deno_graph): remove unused Resolved::Ok#kind usage (#17504)

See https://github.com/denoland/deno_graph/pull/205 for more details.

1 files changed, 7 insertions, 15 deletions

diff --git a/cli/proc_state.rs b/cli/proc_state.rs
index b3c3b90cd..16e80d6f6 100644
--- a/cli/proc_state.rs
+++ b/cli/proc_state.rs
@@ -52,7 +52,6 @@ use deno_graph::source::CacheInfo;
 use deno_graph::source::LoadFuture;
 use deno_graph::source::Loader;
 use deno_graph::source::Resolver;
-use deno_graph::ModuleKind;
 use deno_graph::Resolved;
 use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_node::NodeResolutionMode;
@@ -330,10 +329,6 @@ impl ProcState {
     let has_root_npm_specifier = roots.iter().any(|r| {
       r.scheme() == "npm" && NpmPackageReference::from_specifier(r).is_ok()
     });
-    let roots = roots
-      .into_iter()
-      .map(|s| (s, ModuleKind::Esm))
-      .collect::<Vec<_>>();
 
     if !has_root_npm_specifier {
       let graph_data = self.graph_data.read();
@@ -451,11 +446,10 @@ impl ProcState {
     drop(_pb_clear_guard);
 
     // type check if necessary
-    let is_std_node = roots.len() == 1 && roots[0].0 == *node::MODULE_ALL_URL;
+    let is_std_node = roots.len() == 1 && roots[0] == *node::MODULE_ALL_URL;
     if self.options.type_check_mode() != TypeCheckMode::None && !is_std_node {
       log::debug!("Type checking.");
       let maybe_config_specifier = self.options.maybe_config_file_specifier();
-      let roots = roots.clone();
       let options = check::CheckOptions {
         type_check_mode: self.options.type_check_mode(),
         debug: self.options.log_level() == Some(log::Level::Debug),
@@ -466,7 +460,7 @@ impl ProcState {
           .ts_config,
         log_checks: true,
         reload: self.options.reload_flag()
-          && !roots.iter().all(|r| reload_exclusions.contains(&r.0)),
+          && !roots.iter().all(|r| reload_exclusions.contains(r)),
       };
       let check_cache =
         TypeCheckCache::new(&self.dir.type_checking_cache_db_file_path());
@@ -530,7 +524,7 @@ impl ProcState {
     }
 
     let node_std_graph = self
-      .create_graph(vec![(node::MODULE_ALL_URL.clone(), ModuleKind::Esm)])
+      .create_graph(vec![node::MODULE_ALL_URL.clone()])
       .await?;
     self.graph_data.write().add_graph(&node_std_graph);
     self.node_std_graph_prepared.store(true, Ordering::Relaxed);
@@ -636,9 +630,7 @@ impl ProcState {
       let specifier = self
         .maybe_resolver
         .as_ref()
-        .and_then(|resolver| {
-          resolver.resolve(specifier, &referrer).to_result().ok()
-        })
+        .and_then(|resolver| resolver.resolve(specifier, &referrer).ok())
         .or_else(|| ModuleSpecifier::parse(specifier).ok());
       if let Some(specifier) = specifier {
         if let Ok(reference) = NpmPackageReference::from_specifier(&specifier) {
@@ -655,7 +647,7 @@ impl ProcState {
     }
 
     if let Some(resolver) = &self.maybe_resolver {
-      resolver.resolve(specifier, &referrer).to_result()
+      resolver.resolve(specifier, &referrer)
     } else {
       deno_core::resolve_import(specifier, referrer.as_str())
         .map_err(|err| err.into())
@@ -705,7 +697,7 @@ impl ProcState {
 
   pub async fn create_graph(
     &self,
-    roots: Vec<(ModuleSpecifier, ModuleKind)>,
+    roots: Vec<ModuleSpecifier>,
   ) -> Result<deno_graph::ModuleGraph, AnyError> {
     let mut cache = self.create_graph_loader();
     self.create_graph_with_loader(roots, &mut cache).await
@@ -713,7 +705,7 @@ impl ProcState {
 
   pub async fn create_graph_with_loader(
     &self,
-    roots: Vec<(ModuleSpecifier, ModuleKind)>,
+    roots: Vec<ModuleSpecifier>,
     loader: &mut dyn Loader,
   ) -> Result<deno_graph::ModuleGraph, AnyError> {
     let maybe_imports = self.options.to_maybe_imports()?;