diff options
Diffstat (limited to 'cli/ops')
-rw-r--r-- | cli/ops/compiler.rs | 4 | ||||
-rw-r--r-- | cli/ops/dispatch_json.rs | 2 | ||||
-rw-r--r-- | cli/ops/dispatch_minimal.rs | 10 | ||||
-rw-r--r-- | cli/ops/errors.rs | 2 | ||||
-rw-r--r-- | cli/ops/fetch.rs | 2 | ||||
-rw-r--r-- | cli/ops/files.rs | 2 | ||||
-rw-r--r-- | cli/ops/fs.rs | 2 | ||||
-rw-r--r-- | cli/ops/io.rs | 6 | ||||
-rw-r--r-- | cli/ops/net.rs | 4 | ||||
-rw-r--r-- | cli/ops/os.rs | 2 | ||||
-rw-r--r-- | cli/ops/permissions.rs | 2 | ||||
-rw-r--r-- | cli/ops/plugins.rs | 10 | ||||
-rw-r--r-- | cli/ops/process.rs | 2 | ||||
-rw-r--r-- | cli/ops/random.rs | 2 | ||||
-rw-r--r-- | cli/ops/repl.rs | 4 | ||||
-rw-r--r-- | cli/ops/resources.rs | 2 | ||||
-rw-r--r-- | cli/ops/timers.rs | 2 | ||||
-rw-r--r-- | cli/ops/tls.rs | 4 | ||||
-rw-r--r-- | cli/ops/workers.rs | 2 |
19 files changed, 35 insertions, 31 deletions
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs index 90df45b80..bc85e5ca8 100644 --- a/cli/ops/compiler.rs +++ b/cli/ops/compiler.rs @@ -4,8 +4,8 @@ use crate::futures::future::try_join_all; use crate::msg; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::Loader; -use deno::*; +use deno_core::Loader; +use deno_core::*; pub fn init(i: &mut Isolate, s: &ThreadSafeState) { i.register_op("cache", s.core_op(json_op(s.stateful_op(op_cache)))); diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs index 1636aa44c..7f53a3d80 100644 --- a/cli/ops/dispatch_json.rs +++ b/cli/ops/dispatch_json.rs @@ -1,5 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use deno::*; +use deno_core::*; use futures::future::FutureExt; use futures::task::SpawnExt; pub use serde_derive::Deserialize; diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs index 54bf52679..2d5618d65 100644 --- a/cli/ops/dispatch_minimal.rs +++ b/cli/ops/dispatch_minimal.rs @@ -7,11 +7,11 @@ use crate::deno_error::GetErrorKind; use crate::msg::ErrorKind; use byteorder::{LittleEndian, WriteBytesExt}; -use deno::Buf; -use deno::CoreOp; -use deno::ErrBox; -use deno::Op; -use deno::PinnedBuf; +use deno_core::Buf; +use deno_core::CoreOp; +use deno_core::ErrBox; +use deno_core::Op; +use deno_core::PinnedBuf; use futures::future::FutureExt; use std::future::Future; use std::pin::Pin; diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index 2c40aa66c..19a92c8e7 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -5,7 +5,7 @@ use crate::ops::json_op; use crate::source_maps::get_orig_position; use crate::source_maps::CachedMaps; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use std::collections::HashMap; pub fn init(i: &mut Isolate, s: &ThreadSafeState) { diff --git a/cli/ops/fetch.rs b/cli/ops/fetch.rs index c1bc11973..6779f14e2 100644 --- a/cli/ops/fetch.rs +++ b/cli/ops/fetch.rs @@ -4,7 +4,7 @@ use super::io::StreamResource; use crate::http_util::{get_client, HttpBody}; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use futures::future::FutureExt; use http::header::HeaderName; use http::header::HeaderValue; diff --git a/cli/ops/files.rs b/cli/ops/files.rs index d4ba04ac1..5a8694019 100644 --- a/cli/ops/files.rs +++ b/cli/ops/files.rs @@ -7,7 +7,7 @@ use crate::deno_error::ErrorKind; use crate::fs as deno_fs; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use futures::future::FutureExt; use std; use std::convert::From; diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs index dc9ed1b10..f592c1142 100644 --- a/cli/ops/fs.rs +++ b/cli/ops/fs.rs @@ -6,7 +6,7 @@ use crate::deno_error::ErrorKind; use crate::fs as deno_fs; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use remove_dir_all::remove_dir_all; use std::convert::From; use std::fs; diff --git a/cli/ops/io.rs b/cli/ops/io.rs index 8f69fd444..2a1455aca 100644 --- a/cli/ops/io.rs +++ b/cli/ops/io.rs @@ -4,9 +4,9 @@ use crate::deno_error::bad_resource; use crate::http_util::HttpBody; use crate::ops::minimal_op; use crate::state::ThreadSafeState; -use deno::ErrBox; -use deno::Resource; -use deno::*; +use deno_core::ErrBox; +use deno_core::Resource; +use deno_core::*; use futures::future::FutureExt; use futures::ready; use std::future::Future; diff --git a/cli/ops/net.rs b/cli/ops/net.rs index bf1e56dc9..06905f0d2 100644 --- a/cli/ops/net.rs +++ b/cli/ops/net.rs @@ -5,8 +5,8 @@ use crate::deno_error::bad_resource; use crate::ops::json_op; use crate::resolve_addr::resolve_addr; use crate::state::ThreadSafeState; -use deno::Resource; -use deno::*; +use deno_core::Resource; +use deno_core::*; use futures::future::FutureExt; use std; use std::convert::From; diff --git a/cli/ops/os.rs b/cli/ops/os.rs index b5062f109..e01071230 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -6,7 +6,7 @@ use crate::ops::json_op; use crate::state::ThreadSafeState; use crate::version; use atty; -use deno::*; +use deno_core::*; use std::collections::HashMap; use std::env; use std::io::{Error, ErrorKind}; diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs index 6ecd7cb10..2e282b181 100644 --- a/cli/ops/permissions.rs +++ b/cli/ops/permissions.rs @@ -3,7 +3,7 @@ use super::dispatch_json::{Deserialize, JsonOp, Value}; use crate::deno_error::type_error; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; pub fn init(i: &mut Isolate, s: &ThreadSafeState) { i.register_op( diff --git a/cli/ops/plugins.rs b/cli/ops/plugins.rs index eb52b0717..747ea859d 100644 --- a/cli/ops/plugins.rs +++ b/cli/ops/plugins.rs @@ -2,13 +2,17 @@ use super::dispatch_json::{Deserialize, JsonOp, Value}; use crate::fs as deno_fs; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use dlopen::symbor::Library; use std::collections::HashMap; use std::ffi::OsStr; use std::sync::Arc; -pub fn init(i: &mut Isolate, s: &ThreadSafeState, r: Arc<deno::OpRegistry>) { +pub fn init( + i: &mut Isolate, + s: &ThreadSafeState, + r: Arc<deno_core::OpRegistry>, +) { let r_ = r; i.register_op( "open_plugin", @@ -52,7 +56,7 @@ struct OpenPluginArgs { } pub fn op_open_plugin( - registry: &Arc<deno::OpRegistry>, + registry: &Arc<deno_core::OpRegistry>, state: &ThreadSafeState, args: Value, _zero_copy: Option<PinnedBuf>, diff --git a/cli/ops/process.rs b/cli/ops/process.rs index 80ce4b1ac..8f724fd75 100644 --- a/cli/ops/process.rs +++ b/cli/ops/process.rs @@ -5,7 +5,7 @@ use crate::deno_error::bad_resource; use crate::ops::json_op; use crate::signal::kill; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use futures; use futures::future::FutureExt; use futures::future::TryFutureExt; diff --git a/cli/ops/random.rs b/cli/ops/random.rs index 95dbccf80..334616211 100644 --- a/cli/ops/random.rs +++ b/cli/ops/random.rs @@ -2,7 +2,7 @@ use super::dispatch_json::{JsonOp, Value}; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use rand::thread_rng; use rand::Rng; diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs index fd06a5481..54c8f8574 100644 --- a/cli/ops/repl.rs +++ b/cli/ops/repl.rs @@ -5,8 +5,8 @@ use crate::ops::json_op; use crate::repl; use crate::repl::Repl; use crate::state::ThreadSafeState; -use deno::Resource; -use deno::*; +use deno_core::Resource; +use deno_core::*; use std::sync::Arc; use std::sync::Mutex; diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs index cd7b98aea..861df32b9 100644 --- a/cli/ops/resources.rs +++ b/cli/ops/resources.rs @@ -2,7 +2,7 @@ use super::dispatch_json::{JsonOp, Value}; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; pub fn init(i: &mut Isolate, s: &ThreadSafeState) { i.register_op("resources", s.core_op(json_op(s.stateful_op(op_resources)))); diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs index 982ea9cac..8bec10f70 100644 --- a/cli/ops/timers.rs +++ b/cli/ops/timers.rs @@ -2,7 +2,7 @@ use super::dispatch_json::{Deserialize, JsonOp, Value}; use crate::ops::json_op; use crate::state::ThreadSafeState; -use deno::*; +use deno_core::*; use futures::future::FutureExt; use std; use std::time::Duration; diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs index a2975dcb0..4bbab3f4e 100644 --- a/cli/ops/tls.rs +++ b/cli/ops/tls.rs @@ -7,8 +7,8 @@ use crate::deno_error::ErrorKind; use crate::ops::json_op; use crate::resolve_addr::resolve_addr; use crate::state::ThreadSafeState; -use deno::Resource; -use deno::*; +use deno_core::Resource; +use deno_core::*; use futures::future::FutureExt; use std; use std::convert::From; diff --git a/cli/ops/workers.rs b/cli/ops/workers.rs index 00043ce77..6ebaa141f 100644 --- a/cli/ops/workers.rs +++ b/cli/ops/workers.rs @@ -8,7 +8,7 @@ use crate::ops::json_op; use crate::startup_data; use crate::state::ThreadSafeState; use crate::worker::Worker; -use deno::*; +use deno_core::*; use futures; use futures::future::FutureExt; use futures::future::TryFutureExt; |