diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/inspector_server.rs | 6 | ||||
-rw-r--r-- | runtime/ops/fs.rs | 2 | ||||
-rw-r--r-- | runtime/worker.rs | 30 |
3 files changed, 20 insertions, 18 deletions
diff --git a/runtime/inspector_server.rs b/runtime/inspector_server.rs index de49d375e..3567b964d 100644 --- a/runtime/inspector_server.rs +++ b/runtime/inspector_server.rs @@ -266,16 +266,16 @@ async fn server( future::ready({ match (req.method(), req.uri().path()) { (&http::Method::GET, path) if path.starts_with("/ws/") => { - handle_ws_request(req, inspector_map.clone()) + handle_ws_request(req, Rc::clone(&inspector_map)) } (&http::Method::GET, "/json/version") => { handle_json_version_request(json_version_response.clone()) } (&http::Method::GET, "/json") => { - handle_json_request(inspector_map.clone()) + handle_json_request(Rc::clone(&inspector_map)) } (&http::Method::GET, "/json/list") => { - handle_json_request(inspector_map.clone()) + handle_json_request(Rc::clone(&inspector_map)) } _ => http::Response::builder() .status(http::StatusCode::NOT_FOUND) diff --git a/runtime/ops/fs.rs b/runtime/ops/fs.rs index a3ed09371..12665ab04 100644 --- a/runtime/ops/fs.rs +++ b/runtime/ops/fs.rs @@ -211,7 +211,7 @@ async fn op_open_async( "Deno.open()", )?; let std_file = tokio::task::spawn_blocking(move || { - open_options.open(path.clone()).map_err(|err| { + open_options.open(&path).map_err(|err| { Error::new(err.kind(), format!("{}, open '{}'", err, path.display())) }) }) diff --git a/runtime/worker.rs b/runtime/worker.rs index 360a6b3d7..ea9f4f3e7 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -1,11 +1,13 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use crate::inspector_server::InspectorServer; -use crate::js; -use crate::ops; -use crate::ops::io::Stdio; -use crate::permissions::Permissions; -use crate::BootstrapOptions; +use std::pin::Pin; +use std::rc::Rc; +use std::sync::atomic::AtomicI32; +use std::sync::atomic::Ordering::Relaxed; +use std::sync::Arc; +use std::task::Context; +use std::task::Poll; + use deno_broadcast_channel::InMemoryBroadcastChannel; use deno_cache::CreateCache; use deno_cache::SqliteBackedCache; @@ -31,13 +33,13 @@ use deno_node::RequireNpmResolver; use deno_tls::rustls::RootCertStore; use deno_web::BlobStore; use log::debug; -use std::pin::Pin; -use std::rc::Rc; -use std::sync::atomic::AtomicI32; -use std::sync::atomic::Ordering::Relaxed; -use std::sync::Arc; -use std::task::Context; -use std::task::Poll; + +use crate::inspector_server::InspectorServer; +use crate::js; +use crate::ops; +use crate::ops::io::Stdio; +use crate::permissions::Permissions; +use crate::BootstrapOptions; pub type FormatJsErrorFn = dyn Fn(&JsError) -> String + Sync + Send; @@ -458,7 +460,7 @@ impl MainWorker { /// Return exit code set by the executed code (either in main worker /// or one of child web workers). - pub fn get_exit_code(&self) -> i32 { + pub fn exit_code(&self) -> i32 { self.exit_code.get() } |