diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/async_cancel.rs | 18 | ||||
-rw-r--r-- | core/bindings.rs | 12 | ||||
-rw-r--r-- | core/error.rs | 16 | ||||
-rw-r--r-- | core/examples/fs_module_loader.rs | 4 | ||||
-rw-r--r-- | core/examples/ts_module_loader.rs | 4 |
5 files changed, 30 insertions, 24 deletions
diff --git a/core/async_cancel.rs b/core/async_cancel.rs index a282194f5..5573e543d 100644 --- a/core/async_cancel.rs +++ b/core/async_cancel.rs @@ -1,13 +1,5 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use crate::RcLike; -use crate::Resource; -use futures::future::FusedFuture; -use futures::future::Future; -use futures::future::TryFuture; -use futures::task::Context; -use futures::task::Poll; -use pin_project::pin_project; use std::any::type_name; use std::borrow::Cow; use std::error::Error; @@ -18,6 +10,16 @@ use std::io; use std::pin::Pin; use std::rc::Rc; +use futures::future::FusedFuture; +use futures::future::Future; +use futures::future::TryFuture; +use futures::task::Context; +use futures::task::Poll; +use pin_project::pin_project; + +use crate::RcLike; +use crate::Resource; + use self::internal as i; #[derive(Debug, Default)] diff --git a/core/bindings.rs b/core/bindings.rs index 191538bd2..07ad136ac 100644 --- a/core/bindings.rs +++ b/core/bindings.rs @@ -1,5 +1,12 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. +use std::option::Option; +use std::os::raw::c_void; + +use log::debug; +use v8::fast_api::FastFunction; +use v8::MapFnTo; + use crate::error::is_instance_of_error; use crate::modules::get_asserted_module_type_from_assertions; use crate::modules::parse_import_assertions; @@ -9,11 +16,6 @@ use crate::modules::ModuleMap; use crate::ops::OpCtx; use crate::runtime::SnapshotOptions; use crate::JsRuntime; -use log::debug; -use std::option::Option; -use std::os::raw::c_void; -use v8::fast_api::FastFunction; -use v8::MapFnTo; pub fn external_references( ops: &[OpCtx], diff --git a/core/error.rs b/core/error.rs index d788e14b5..02ed95ef7 100644 --- a/core/error.rs +++ b/core/error.rs @@ -1,12 +1,5 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use crate::runtime::GetErrorClassFn; -use crate::runtime::JsRealm; -use crate::runtime::JsRuntime; -use crate::source_map::apply_source_map; -use crate::source_map::get_source_line; -use crate::url::Url; -use anyhow::Error; use std::borrow::Cow; use std::collections::HashSet; use std::fmt; @@ -14,6 +7,15 @@ use std::fmt::Debug; use std::fmt::Display; use std::fmt::Formatter; +use anyhow::Error; + +use crate::runtime::GetErrorClassFn; +use crate::runtime::JsRealm; +use crate::runtime::JsRuntime; +use crate::source_map::apply_source_map; +use crate::source_map::get_source_line; +use crate::url::Url; + /// A generic wrapper that can encapsulate any concrete error type. // TODO(ry) Deprecate AnyError and encourage deno_core::anyhow::Error instead. pub type AnyError = anyhow::Error; diff --git a/core/examples/fs_module_loader.rs b/core/examples/fs_module_loader.rs index 0fe122238..620204c60 100644 --- a/core/examples/fs_module_loader.rs +++ b/core/examples/fs_module_loader.rs @@ -12,7 +12,7 @@ fn main() -> Result<(), Error> { println!("Usage: target/examples/debug/fs_module_loader <path_to_module>"); std::process::exit(1); } - let main_url = args[1].clone(); + let main_url = &args[1]; println!("Run {}", main_url); let mut js_runtime = JsRuntime::new(RuntimeOptions { @@ -24,7 +24,7 @@ fn main() -> Result<(), Error> { .enable_all() .build()?; - let main_module = deno_core::resolve_path(&main_url)?; + let main_module = deno_core::resolve_path(main_url)?; let future = async move { let mod_id = js_runtime.load_main_module(&main_module, None).await?; diff --git a/core/examples/ts_module_loader.rs b/core/examples/ts_module_loader.rs index 5493029a4..d9b32d5be 100644 --- a/core/examples/ts_module_loader.rs +++ b/core/examples/ts_module_loader.rs @@ -97,7 +97,7 @@ fn main() -> Result<(), Error> { println!("Usage: target/examples/debug/ts_module_loader <path_to_module>"); std::process::exit(1); } - let main_url = args[1].clone(); + let main_url = &args[1]; println!("Run {}", main_url); let mut js_runtime = JsRuntime::new(RuntimeOptions { @@ -105,7 +105,7 @@ fn main() -> Result<(), Error> { ..Default::default() }); - let main_module = resolve_path(&main_url)?; + let main_module = resolve_path(main_url)?; let future = async move { let mod_id = js_runtime.load_main_module(&main_module, None).await?; |