From 654e177c919babe4eef4c1c9545ef267b23884e6 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Tue, 24 Jan 2023 14:23:19 +0100 Subject: refactor(deno_graph): remove unused Resolved::Ok#kind usage (#17504) See https://github.com/denoland/deno_graph/pull/205 for more details. --- cli/tools/vendor/mod.rs | 7 ++----- cli/tools/vendor/test.rs | 9 ++------- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'cli/tools/vendor') diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs index aa306275c..209eb30b7 100644 --- a/cli/tools/vendor/mod.rs +++ b/cli/tools/vendor/mod.rs @@ -268,11 +268,8 @@ async fn create_graph( let entry_points = flags .specifiers .iter() - .map(|p| { - let url = resolve_url_or_path(p)?; - Ok((url, deno_graph::ModuleKind::Esm)) - }) - .collect::, AnyError>>()?; + .map(|p| resolve_url_or_path(p)) + .collect::, _>>()?; ps.create_graph(entry_points).await } diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index 4ac2bac86..a24fa1e4f 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -17,7 +17,6 @@ use deno_graph::source::LoadFuture; use deno_graph::source::LoadResponse; use deno_graph::source::Loader; use deno_graph::ModuleGraph; -use deno_graph::ModuleKind; use import_map::ImportMap; use crate::cache::ParsedSourceCache; @@ -214,11 +213,7 @@ impl VendorTestBuilder { pub async fn build(&mut self) -> Result { let output_dir = make_path("/vendor"); - let roots = self - .entry_points - .iter() - .map(|s| (s.to_owned(), deno_graph::ModuleKind::Esm)) - .collect(); + let roots = self.entry_points.clone(); let loader = self.loader.clone(); let parsed_source_cache = ParsedSourceCache::new(None); let analyzer = parsed_source_cache.as_analyzer(); @@ -260,7 +255,7 @@ impl VendorTestBuilder { } async fn build_test_graph( - roots: Vec<(ModuleSpecifier, ModuleKind)>, + roots: Vec, original_import_map: Option, mut loader: TestLoader, analyzer: &dyn deno_graph::ModuleAnalyzer, -- cgit v1.2.3