diff options
-rw-r--r-- | Cargo.lock | 1 | ||||
-rw-r--r-- | cli/Cargo.toml | 1 | ||||
-rw-r--r-- | cli/http_cache.rs | 2 | ||||
-rw-r--r-- | cli/main.rs | 1 | ||||
-rw-r--r-- | cli/ops/errors.rs | 2 | ||||
-rw-r--r-- | cli/ops/fetch.rs | 2 | ||||
-rw-r--r-- | cli/ops/fs.rs | 2 | ||||
-rw-r--r-- | cli/ops/fs_events.rs | 2 | ||||
-rw-r--r-- | cli/ops/idna.rs | 2 | ||||
-rw-r--r-- | cli/ops/net.rs | 2 | ||||
-rw-r--r-- | cli/ops/net_unix.rs | 2 | ||||
-rw-r--r-- | cli/ops/os.rs | 2 | ||||
-rw-r--r-- | cli/ops/permissions.rs | 2 | ||||
-rw-r--r-- | cli/ops/plugin.rs | 2 | ||||
-rw-r--r-- | cli/ops/process.rs | 2 | ||||
-rw-r--r-- | cli/ops/repl.rs | 2 | ||||
-rw-r--r-- | cli/ops/resources.rs | 2 | ||||
-rw-r--r-- | cli/ops/runtime_compiler.rs | 2 | ||||
-rw-r--r-- | cli/ops/signal.rs | 2 | ||||
-rw-r--r-- | cli/ops/timers.rs | 2 | ||||
-rw-r--r-- | cli/ops/tls.rs | 2 | ||||
-rw-r--r-- | cli/ops/tty.rs | 4 | ||||
-rw-r--r-- | cli/ops/websocket.rs | 2 | ||||
-rw-r--r-- | cli/ops/worker_host.rs | 2 |
24 files changed, 22 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock index 62a5e9ba3..bc774d9dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -430,7 +430,6 @@ dependencies = [ "rustyline", "semver-parser 0.9.0", "serde", - "serde_derive", "serde_json", "sourcemap", "swc_common", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 660fa4492..a5e20e761 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -58,7 +58,6 @@ reqwest = { version = "0.10.8", default-features = false, features = ["rustls-tl ring = "0.16.15" rustyline = { version = "6.3.0", default-features = false } serde = { version = "1.0.116", features = ["derive"] } -serde_derive = "1.0.116" serde_json = { version = "1.0.57", features = [ "preserve_order" ] } sys-info = "0.7.0" sourcemap = "6.0.1" diff --git a/cli/http_cache.rs b/cli/http_cache.rs index 6b2465b38..a1147c215 100644 --- a/cli/http_cache.rs +++ b/cli/http_cache.rs @@ -7,8 +7,8 @@ use crate::fs as deno_fs; use crate::http_util::HeadersMap; use deno_core::error::AnyError; +use serde::Deserialize; use serde::Serialize; -use serde_derive::Deserialize; use std::fs; use std::fs::File; use std::io; diff --git a/cli/main.rs b/cli/main.rs index 64c73664c..cd32207c7 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -18,7 +18,6 @@ extern crate rand; extern crate regex; extern crate reqwest; extern crate serde; -extern crate serde_derive; extern crate tokio; extern crate url; diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index fdf30907e..5012b0db0 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -6,7 +6,7 @@ use crate::source_maps::CachedMaps; use deno_core::error::AnyError; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::collections::HashMap; diff --git a/cli/ops/fetch.rs b/cli/ops/fetch.rs index 4e4d35d50..415645d2a 100644 --- a/cli/ops/fetch.rs +++ b/cli/ops/fetch.rs @@ -14,7 +14,7 @@ use http::header::HeaderName; use http::header::HeaderValue; use http::Method; use reqwest::Client; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::convert::From; diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs index 30e995a44..5189d7099 100644 --- a/cli/ops/fs.rs +++ b/cli/ops/fs.rs @@ -10,7 +10,7 @@ use deno_core::OpState; use deno_core::ZeroCopyBuf; use rand::thread_rng; use rand::Rng; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::convert::From; diff --git a/cli/ops/fs_events.rs b/cli/ops/fs_events.rs index 72c1bd6e1..bba68f4e4 100644 --- a/cli/ops/fs_events.rs +++ b/cli/ops/fs_events.rs @@ -12,8 +12,8 @@ use notify::EventKind; use notify::RecommendedWatcher; use notify::RecursiveMode; use notify::Watcher; +use serde::Deserialize; use serde::Serialize; -use serde_derive::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::convert::From; diff --git a/cli/ops/idna.rs b/cli/ops/idna.rs index 60812015f..c81d9c314 100644 --- a/cli/ops/idna.rs +++ b/cli/ops/idna.rs @@ -7,7 +7,7 @@ use deno_core::error::AnyError; use deno_core::ZeroCopyBuf; use idna::domain_to_ascii; use idna::domain_to_ascii_strict; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; pub fn init(rt: &mut deno_core::JsRuntime) { diff --git a/cli/ops/net.rs b/cli/ops/net.rs index 7dd9082b6..44229f177 100644 --- a/cli/ops/net.rs +++ b/cli/ops/net.rs @@ -13,7 +13,7 @@ use deno_core::BufVec; use deno_core::OpState; use deno_core::ZeroCopyBuf; use futures::future::poll_fn; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::net::Shutdown; diff --git a/cli/ops/net_unix.rs b/cli/ops/net_unix.rs index 8cadaf207..cf4470f13 100644 --- a/cli/ops/net_unix.rs +++ b/cli/ops/net_unix.rs @@ -7,7 +7,7 @@ use deno_core::error::AnyError; use deno_core::BufVec; use deno_core::OpState; use futures::future::poll_fn; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::fs::remove_file; diff --git a/cli/ops/os.rs b/cli/ops/os.rs index 1d0263d6c..a02318b46 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -3,7 +3,7 @@ use deno_core::error::AnyError; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; +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 ac9288fdc..2cdb03e31 100644 --- a/cli/ops/permissions.rs +++ b/cli/ops/permissions.rs @@ -4,7 +4,7 @@ use deno_core::error::custom_error; use deno_core::error::AnyError; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::path::Path; diff --git a/cli/ops/plugin.rs b/cli/ops/plugin.rs index 8def032ec..e0081ce09 100644 --- a/cli/ops/plugin.rs +++ b/cli/ops/plugin.rs @@ -12,7 +12,7 @@ use deno_core::OpState; use deno_core::ZeroCopyBuf; use dlopen::symbor::Library; use futures::prelude::*; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::path::PathBuf; diff --git a/cli/ops/process.rs b/cli/ops/process.rs index e19257379..3a7db8249 100644 --- a/cli/ops/process.rs +++ b/cli/ops/process.rs @@ -10,7 +10,7 @@ use deno_core::OpState; use deno_core::ZeroCopyBuf; use futures::future::poll_fn; use futures::future::FutureExt; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::rc::Rc; diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs index 5687ba80a..d2fe5ebe9 100644 --- a/cli/ops/repl.rs +++ b/cli/ops/repl.rs @@ -7,7 +7,7 @@ use deno_core::error::AnyError; use deno_core::BufVec; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::rc::Rc; diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs index fa4e2686e..bd6ba2941 100644 --- a/cli/ops/resources.rs +++ b/cli/ops/resources.rs @@ -4,7 +4,7 @@ use deno_core::error::bad_resource_id; use deno_core::error::AnyError; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; pub fn init(rt: &mut deno_core::JsRuntime) { diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs index 0b78f39d1..fe1b4d9e1 100644 --- a/cli/ops/runtime_compiler.rs +++ b/cli/ops/runtime_compiler.rs @@ -7,7 +7,7 @@ use crate::tsc::runtime_transpile; use deno_core::error::AnyError; use deno_core::BufVec; use deno_core::OpState; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::collections::HashMap; diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs index c1917945e..a731a72aa 100644 --- a/cli/ops/signal.rs +++ b/cli/ops/signal.rs @@ -13,7 +13,7 @@ use deno_core::error::bad_resource_id; #[cfg(unix)] use futures::future::poll_fn; #[cfg(unix)] -use serde_derive::Deserialize; +use serde::Deserialize; #[cfg(unix)] use std::task::Waker; #[cfg(unix)] diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs index a8f5be900..16220d56a 100644 --- a/cli/ops/timers.rs +++ b/cli/ops/timers.rs @@ -5,7 +5,7 @@ use deno_core::BufVec; use deno_core::OpState; use deno_core::ZeroCopyBuf; use futures::future::FutureExt; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::rc::Rc; diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs index 6210b8b01..38b18077d 100644 --- a/cli/ops/tls.rs +++ b/cli/ops/tls.rs @@ -10,7 +10,7 @@ use deno_core::BufVec; use deno_core::OpState; use deno_core::ZeroCopyBuf; use futures::future::poll_fn; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::convert::From; diff --git a/cli/ops/tty.rs b/cli/ops/tty.rs index 07f24fd16..54ebcada6 100644 --- a/cli/ops/tty.rs +++ b/cli/ops/tty.rs @@ -9,8 +9,8 @@ use deno_core::error::resource_unavailable; use deno_core::error::AnyError; use deno_core::OpState; use deno_core::ZeroCopyBuf; -use serde_derive::Deserialize; -use serde_derive::Serialize; +use serde::Deserialize; +use serde::Serialize; use serde_json::Value; #[cfg(unix)] diff --git a/cli/ops/websocket.rs b/cli/ops/websocket.rs index 6d5f39895..4c974d558 100644 --- a/cli/ops/websocket.rs +++ b/cli/ops/websocket.rs @@ -10,7 +10,7 @@ use futures::future::poll_fn; use futures::StreamExt; use futures::{ready, SinkExt}; use http::{Method, Request, Uri}; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::borrow::Cow; use std::cell::RefCell; diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs index e9e4ac212..deaf6a06b 100644 --- a/cli/ops/worker_host.rs +++ b/cli/ops/worker_host.rs @@ -14,7 +14,7 @@ use deno_core::ModuleSpecifier; use deno_core::OpState; use deno_core::ZeroCopyBuf; use futures::future::FutureExt; -use serde_derive::Deserialize; +use serde::Deserialize; use serde_json::Value; use std::cell::RefCell; use std::convert::From; |