24 files changed, 85 insertions, 42 deletions
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 618851daa..faf5fff32 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -1,5 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
+use deno_core::serde_json::json;
 use std::sync::Arc;
 use std::sync::Mutex;
 
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs
index a21e68faa..ae8fa819d 100644
--- a/cli/ops/dispatch_minimal.rs
+++ b/cli/ops/dispatch_minimal.rs
@@ -1,11 +1,11 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 use deno_core::error::AnyError;
+use deno_core::futures::future::FutureExt;
 use deno_core::BufVec;
 use deno_core::Op;
 use deno_core::OpFn;
 use deno_core::OpState;
-use futures::future::FutureExt;
 use std::cell::RefCell;
 use std::future::Future;
 use std::iter::repeat;
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index 6bf0983e2..40ea01370 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -4,10 +4,12 @@ use crate::diagnostics::Diagnostics;
 use crate::source_maps::get_orig_position;
 use crate::source_maps::CachedMaps;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
-use serde_json::Value;
 use std::collections::HashMap;
 
 pub fn init(rt: &mut deno_core::JsRuntime) {
diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index ad5cc8add..7610231c7 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -6,13 +6,15 @@ use crate::permissions::Permissions;
 use deno_core::error::custom_error;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use rand::thread_rng;
 use rand::Rng;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::convert::From;
 use std::env::{current_dir, set_current_dir, temp_dir};
diff --git a/cli/ops/fs_events.rs b/cli/ops/fs_events.rs
index a79784c5a..4832c915c 100644
--- a/cli/ops/fs_events.rs
+++ b/cli/ops/fs_events.rs
@@ -3,10 +3,13 @@
 use crate::permissions::Permissions;
 use deno_core::error::bad_resource_id;
 use deno_core::error::AnyError;
+use deno_core::futures::future::poll_fn;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::future::poll_fn;
 use notify::event::Event as NotifyEvent;
 use notify::Error as NotifyError;
 use notify::EventKind;
@@ -15,7 +18,6 @@ use notify::RecursiveMode;
 use notify::Watcher;
 use serde::Deserialize;
 use serde::Serialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::convert::From;
 use std::path::PathBuf;
diff --git a/cli/ops/io.rs b/cli/ops/io.rs
index d481e8211..80ae6bc9e 100644
--- a/cli/ops/io.rs
+++ b/cli/ops/io.rs
@@ -8,12 +8,13 @@ use deno_core::error::bad_resource_id;
 use deno_core::error::resource_unavailable;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
+use deno_core::futures;
+use deno_core::futures::future::poll_fn;
+use deno_core::futures::future::FutureExt;
+use deno_core::futures::ready;
 use deno_core::BufVec;
 use deno_core::JsRuntime;
 use deno_core::OpState;
-use futures::future::poll_fn;
-use futures::future::FutureExt;
-use futures::ready;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::pin::Pin;
diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 3149f147d..ddc648be6 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -33,11 +33,11 @@ use crate::metrics::metrics_op;
 use deno_core::error::AnyError;
 use deno_core::json_op_async;
 use deno_core::json_op_sync;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::JsRuntime;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::future::Future;
 use std::rc::Rc;
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 4e35f2247..c0cb84a9b 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -10,12 +10,15 @@ use deno_core::error::custom_error;
 use deno_core::error::generic_error;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
+use deno_core::futures;
+use deno_core::futures::future::poll_fn;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::future::poll_fn;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::net::Shutdown;
 use std::net::SocketAddr;
diff --git a/cli/ops/net_unix.rs b/cli/ops/net_unix.rs
index a54c53630..4c416a5a4 100644
--- a/cli/ops/net_unix.rs
+++ b/cli/ops/net_unix.rs
@@ -6,11 +6,12 @@ use crate::ops::net::AcceptArgs;
 use crate::ops::net::ReceiveArgs;
 use deno_core::error::bad_resource;
 use deno_core::error::AnyError;
+use deno_core::futures::future::poll_fn;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
-use futures::future::poll_fn;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::fs::remove_file;
 use std::os::unix;
@@ -49,7 +50,7 @@ pub(crate) async fn accept_unix(
       .get_mut::<UnixListenerResource>(rid)
       .ok_or_else(|| bad_resource("Listener has been closed"))?;
     let listener = &mut listener_resource.listener;
-    use futures::StreamExt;
+    use deno_core::futures::StreamExt;
     match listener.poll_next_unpin(cx) {
       Poll::Ready(Some(stream)) => {
         //listener_resource.untrack_task();
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index 42d09da86..4b28f898e 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -2,11 +2,13 @@
 
 use crate::permissions::Permissions;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::url::Url;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
-use serde_json::Value;
 use std::collections::HashMap;
 use std::env;
 
diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 54dda78bc..7474c0e37 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -3,10 +3,12 @@
 use crate::permissions::Permissions;
 use deno_core::error::custom_error;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
-use serde_json::Value;
 use std::path::Path;
 
 pub fn init(rt: &mut deno_core::JsRuntime) {
diff --git a/cli/ops/plugin.rs b/cli/ops/plugin.rs
index c862fb674..f929a89d3 100644
--- a/cli/ops/plugin.rs
+++ b/cli/ops/plugin.rs
@@ -3,7 +3,11 @@
 use crate::metrics::metrics_op;
 use crate::permissions::Permissions;
 use deno_core::error::AnyError;
+use deno_core::futures::prelude::*;
 use deno_core::plugin_api;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::JsRuntime;
 use deno_core::Op;
@@ -12,9 +16,7 @@ use deno_core::OpId;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use dlopen::symbor::Library;
-use futures::prelude::*;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::path::PathBuf;
 use std::pin::Pin;
diff --git a/cli/ops/process.rs b/cli/ops/process.rs
index 5099889cd..48b945f07 100644
--- a/cli/ops/process.rs
+++ b/cli/ops/process.rs
@@ -6,13 +6,15 @@ use crate::signal::kill;
 use deno_core::error::bad_resource_id;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
+use deno_core::futures::future::poll_fn;
+use deno_core::futures::future::FutureExt;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::future::poll_fn;
-use futures::future::FutureExt;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::rc::Rc;
 use tokio::process::Command;
diff --git a/cli/ops/random.rs b/cli/ops/random.rs
index 84e38d105..53aedb73f 100644
--- a/cli/ops/random.rs
+++ b/cli/ops/random.rs
@@ -1,12 +1,13 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 use deno_core::error::AnyError;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use rand::rngs::StdRng;
 use rand::thread_rng;
 use rand::Rng;
-use serde_json::Value;
 
 pub fn init(rt: &mut deno_core::JsRuntime) {
   super::reg_json_sync(rt, "op_get_random_values", op_get_random_values);
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index c87f7dc5c..a2c26b2ab 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -4,11 +4,13 @@ use crate::repl;
 use crate::repl::Repl;
 use deno_core::error::bad_resource_id;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
diff --git a/cli/ops/runtime.rs b/cli/ops/runtime.rs
index 27f2dc8c5..d059301f1 100644
--- a/cli/ops/runtime.rs
+++ b/cli/ops/runtime.rs
@@ -6,10 +6,12 @@ use crate::permissions::Permissions;
 use crate::version;
 use crate::DenoSubcommand;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::ModuleSpecifier;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use serde_json::Value;
 use std::env;
 
 pub fn init(rt: &mut deno_core::JsRuntime) {
diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs
index f2839585c..b51cda95b 100644
--- a/cli/ops/runtime_compiler.rs
+++ b/cli/ops/runtime_compiler.rs
@@ -5,11 +5,12 @@ use crate::tsc::runtime_bundle;
 use crate::tsc::runtime_compile;
 use crate::tsc::runtime_transpile;
 use deno_core::error::AnyError;
+use deno_core::futures::FutureExt;
+use deno_core::serde_json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
-use futures::FutureExt;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;
diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs
index 3f4c5c8ee..4159de84a 100644
--- a/cli/ops/signal.rs
+++ b/cli/ops/signal.rs
@@ -1,17 +1,21 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 use deno_core::error::AnyError;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::rc::Rc;
 
 #[cfg(unix)]
 use deno_core::error::bad_resource_id;
 #[cfg(unix)]
-use futures::future::poll_fn;
+use deno_core::futures::future::poll_fn;
+#[cfg(unix)]
+use deno_core::serde_json;
+#[cfg(unix)]
+use deno_core::serde_json::json;
 #[cfg(unix)]
 use serde::Deserialize;
 #[cfg(unix)]
diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs
index a3aef3fef..b7ea62539 100644
--- a/cli/ops/timers.rs
+++ b/cli/ops/timers.rs
@@ -10,14 +10,17 @@
 
 use crate::permissions::Permissions;
 use deno_core::error::AnyError;
+use deno_core::futures;
+use deno_core::futures::channel::oneshot;
+use deno_core::futures::FutureExt;
+use deno_core::futures::TryFutureExt;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::channel::oneshot;
-use futures::FutureExt;
-use futures::TryFutureExt;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::future::Future;
 use std::rc::Rc;
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index 448e33a9d..1b812c33f 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -7,12 +7,15 @@ use deno_core::error::bad_resource;
 use deno_core::error::bad_resource_id;
 use deno_core::error::custom_error;
 use deno_core::error::AnyError;
+use deno_core::futures;
+use deno_core::futures::future::poll_fn;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::future::poll_fn;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::convert::From;
 use std::fs::File;
diff --git a/cli/ops/tty.rs b/cli/ops/tty.rs
index 410256163..767309054 100644
--- a/cli/ops/tty.rs
+++ b/cli/ops/tty.rs
@@ -7,11 +7,13 @@ use deno_core::error::bad_resource_id;
 use deno_core::error::last_os_error;
 use deno_core::error::resource_unavailable;
 use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use serde::Serialize;
-use serde_json::Value;
 
 #[cfg(unix)]
 use deno_core::error::not_supported;
diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs
index fad0b9df7..e57edaf6c 100644
--- a/cli/ops/web_worker.rs
+++ b/cli/ops/web_worker.rs
@@ -2,7 +2,8 @@
 
 use crate::web_worker::WebWorkerHandle;
 use crate::worker::WorkerEvent;
-use futures::channel::mpsc;
+use deno_core::futures::channel::mpsc;
+use deno_core::serde_json::json;
 
 pub fn init(
   rt: &mut deno_core::JsRuntime,
diff --git a/cli/ops/websocket.rs b/cli/ops/websocket.rs
index e16ce258c..6c4d079b6 100644
--- a/cli/ops/websocket.rs
+++ b/cli/ops/websocket.rs
@@ -5,15 +5,17 @@ use core::task::Poll;
 use deno_core::error::bad_resource_id;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
+use deno_core::futures::future::poll_fn;
+use deno_core::futures::StreamExt;
+use deno_core::futures::{ready, SinkExt};
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::url;
 use deno_core::BufVec;
 use deno_core::OpState;
-use futures::future::poll_fn;
-use futures::StreamExt;
-use futures::{ready, SinkExt};
 use http::{Method, Request, Uri};
 use serde::Deserialize;
-use serde_json::Value;
 use std::borrow::Cow;
 use std::cell::RefCell;
 use std::fs::File;
diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs
index f7b981c14..058ffaa31 100644
--- a/cli/ops/worker_host.rs
+++ b/cli/ops/worker_host.rs
@@ -9,13 +9,15 @@ use crate::web_worker::WebWorker;
 use crate::web_worker::WebWorkerHandle;
 use crate::worker::WorkerEvent;
 use deno_core::error::AnyError;
+use deno_core::futures::future::FutureExt;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::ModuleSpecifier;
 use deno_core::OpState;
 use deno_core::ZeroCopyBuf;
-use futures::future::FutureExt;
 use serde::Deserialize;
-use serde_json::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::convert::From;