diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-01-24 14:23:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-24 08:23:19 -0500 |
commit | 654e177c919babe4eef4c1c9545ef267b23884e6 (patch) | |
tree | 7e8e00bef1afa9a062be9baf14fa9865865ec844 /cli/resolver.rs | |
parent | 0d1471282bf758ed5f84e570bffa9424c7b8f26f (diff) |
refactor(deno_graph): remove unused Resolved::Ok#kind usage (#17504)
See https://github.com/denoland/deno_graph/pull/205 for more details.
Diffstat (limited to 'cli/resolver.rs')
-rw-r--r-- | cli/resolver.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cli/resolver.rs b/cli/resolver.rs index ec46165e0..817b5d3b0 100644 --- a/cli/resolver.rs +++ b/cli/resolver.rs @@ -1,8 +1,8 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. +use deno_core::error::AnyError; use deno_core::resolve_import; use deno_core::ModuleSpecifier; -use deno_graph::source::ResolveResponse; use deno_graph::source::Resolver; use deno_graph::source::DEFAULT_JSX_IMPORT_SOURCE_MODULE; use import_map::ImportMap; @@ -63,19 +63,13 @@ impl Resolver for CliResolver { &self, specifier: &str, referrer: &ModuleSpecifier, - ) -> ResolveResponse { + ) -> Result<ModuleSpecifier, AnyError> { if let Some(import_map) = &self.maybe_import_map { - match import_map.resolve(specifier, referrer) { - Ok(resolved_specifier) => { - ResolveResponse::Specifier(resolved_specifier) - } - Err(err) => ResolveResponse::Err(err.into()), - } + import_map + .resolve(specifier, referrer) + .map_err(|err| err.into()) } else { - match resolve_import(specifier, referrer.as_str()) { - Ok(specifier) => ResolveResponse::Specifier(specifier), - Err(err) => ResolveResponse::Err(err.into()), - } + resolve_import(specifier, referrer.as_str()).map_err(|err| err.into()) } } } |