From 16ed81f62cac68f1ef0cfa925fffbf2d208eed61 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Sat, 25 May 2024 21:13:20 -0700 Subject: [PATCH] chore(cli): remove extract_standalone path from CLI (#23982) No longer needed as standalone binaries use `denort` --- cli/main.rs | 29 +++++------------------------ cli/standalone/mod.rs | 5 +++++ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/cli/main.rs b/cli/main.rs index a2d270d4018ef..586c2ff10d0e9 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -49,9 +49,7 @@ use deno_runtime::fmt_errors::format_js_error; use deno_runtime::tokio_util::create_and_run_current_thread_with_maybe_metrics; use deno_terminal::colors; use factory::CliFactory; -use std::borrow::Cow; use std::env; -use std::env::current_exe; use std::future::Future; use std::path::PathBuf; @@ -331,29 +329,12 @@ pub fn main() { ); let args: Vec<_> = env::args_os().collect(); - let current_exe_path = current_exe().unwrap(); - let maybe_standalone = match standalone::extract_standalone( - ¤t_exe_path, - Cow::Borrowed(&args), - ) { - Ok(standalone) => standalone, - Err(err) => exit_for_error(err), - }; - let future = async move { - match maybe_standalone { - Some(future) => { - let (metadata, eszip) = future.await?; - standalone::run(eszip, metadata).await - } - None => { - // NOTE(lucacasonato): due to new PKU feature introduced in V8 11.6 we need to - // initialize the V8 platform on a parent thread of all threads that will spawn - // V8 isolates. - let flags = resolve_flags_and_init(args)?; - run_subcommand(flags).await - } - } + // NOTE(lucacasonato): due to new PKU feature introduced in V8 11.6 we need to + // initialize the V8 platform on a parent thread of all threads that will spawn + // V8 isolates. + let flags = resolve_flags_and_init(args)?; + run_subcommand(flags).await }; match create_and_run_current_thread_with_maybe_metrics(future) { diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 1c081bc869264..8f8a78de0b46d 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -1,5 +1,10 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. +// Allow unused code warnings because we share +// code between the two bin targets. +#![allow(dead_code)] +#![allow(unused_imports)] + use crate::args::create_default_npmrc; use crate::args::get_root_cert_store; use crate::args::npm_pkg_req_ref_to_binary_command;