From c4771356f27b250e7fdbcede0de5682982720455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 13 Mar 2023 19:31:03 -0400
Subject: refactor: Remove call sites of "deno_core::resolve_url_or_path"
 (#18169)

These call sites didn't need to use "resolve_url_or_path".

Towards landing https://github.com/denoland/deno/pull/15454
---
 cli/tools/repl/mod.rs     | 6 ++++--
 cli/tools/repl/session.rs | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'cli/tools/repl')

diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs
index a9cb0132b..99dab6261 100644
--- a/cli/tools/repl/mod.rs
+++ b/cli/tools/repl/mod.rs
@@ -5,8 +5,9 @@ use crate::args::ReplFlags;
 use crate::colors;
 use crate::proc_state::ProcState;
 use crate::worker::create_main_worker;
+use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
-use deno_core::resolve_url_or_path;
+use deno_core::resolve_path;
 use deno_runtime::permissions::Permissions;
 use deno_runtime::permissions::PermissionsContainer;
 use rustyline::error::ReadlineError;
@@ -80,7 +81,8 @@ async fn read_eval_file(
 }
 
 pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result<i32, AnyError> {
-  let main_module = resolve_url_or_path("./$deno$repl.ts").unwrap();
+  let cwd = std::env::current_dir().context("Unable to get CWD")?;
+  let main_module = resolve_path("./$deno$repl.ts", &cwd).unwrap();
   let ps = ProcState::build(flags).await?;
   let mut worker = create_main_worker(
     &ps,
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs
index e9ddd09b1..1cd67fc97 100644
--- a/cli/tools/repl/session.rs
+++ b/cli/tools/repl/session.rs
@@ -11,6 +11,7 @@ use deno_ast::swc::visit::VisitWith;
 use deno_ast::DiagnosticsError;
 use deno_ast::ImportsNotUsedAsValues;
 use deno_ast::ModuleSpecifier;
+use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use deno_core::futures::channel::mpsc::UnboundedReceiver;
 use deno_core::futures::FutureExt;
@@ -143,7 +144,8 @@ impl ReplSession {
     }
     assert_ne!(context_id, 0);
 
-    let referrer = deno_core::resolve_url_or_path("./$deno$repl.ts").unwrap();
+    let cwd = std::env::current_dir().context("Unable to get CWD")?;
+    let referrer = deno_core::resolve_path("./$deno$repl.ts", &cwd).unwrap();
 
     let mut repl_session = ReplSession {
       proc_state,
-- 
cgit v1.2.3