diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2021-12-01 11:13:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-01 11:13:11 -0500 |
commit | 084caffc08ceb33c4d20c4b6d744ce15c19c4baf (patch) | |
tree | bc7a2aa6b6bb55c2383912b6f8a542e648488fdc /cli | |
parent | 4c36fa1fdf6c353fb01f2ec80da39a52e969fb5f (diff) |
refactor: cli doesn't need to depend on deno_tls (#12952)
also move create_http_client to deno_fetch
Diffstat (limited to 'cli')
-rw-r--r-- | cli/Cargo.toml | 1 | ||||
-rw-r--r-- | cli/file_fetcher.rs | 4 | ||||
-rw-r--r-- | cli/http_util.rs | 5 | ||||
-rw-r--r-- | cli/proc_state.rs | 6 | ||||
-rw-r--r-- | cli/standalone.rs | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7f2ee1bbe..b5767788f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -45,7 +45,6 @@ deno_doc = "0.21.0" deno_graph = "0.12.0" deno_lint = { version = "0.19.0", features = ["docs"] } deno_runtime = { version = "0.35.0", path = "../runtime" } -deno_tls = { version = "0.14.0", path = "../ext/tls" } atty = "0.2.14" base64 = "0.13.0" diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs index 246491394..924076872 100644 --- a/cli/file_fetcher.rs +++ b/cli/file_fetcher.rs @@ -18,11 +18,11 @@ use deno_core::futures; use deno_core::futures::future::FutureExt; use deno_core::parking_lot::Mutex; use deno_core::ModuleSpecifier; +use deno_runtime::deno_fetch::create_http_client; use deno_runtime::deno_fetch::reqwest; +use deno_runtime::deno_tls::rustls::RootCertStore; use deno_runtime::deno_web::BlobStore; use deno_runtime::permissions::Permissions; -use deno_tls::create_http_client; -use deno_tls::rustls::RootCertStore; use log::debug; use log::info; use std::borrow::Borrow; diff --git a/cli/http_util.rs b/cli/http_util.rs index 1a2aaf0d5..c66fa32d3 100644 --- a/cli/http_util.rs +++ b/cli/http_util.rs @@ -148,7 +148,8 @@ pub async fn fetch_once( mod tests { use super::*; use crate::version; - use deno_tls::create_http_client; + use deno_runtime::deno_fetch::create_http_client; + use deno_runtime::deno_tls::rustls::RootCertStore; use std::fs::read; fn create_test_client() -> Client { @@ -413,7 +414,7 @@ mod tests { let url = Url::parse("https://deno.land").unwrap(); let client = create_http_client( version::get_user_agent(), - Some(deno_tls::rustls::RootCertStore::empty()), // no certs loaded at all + Some(RootCertStore::empty()), // no certs loaded at all vec![], None, None, diff --git a/cli/proc_state.rs b/cli/proc_state.rs index b62cdc464..be3213a62 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -38,12 +38,12 @@ use deno_graph::MediaType; use deno_graph::ModuleGraphError; use deno_graph::Range; use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel; +use deno_runtime::deno_tls::rustls::RootCertStore; +use deno_runtime::deno_tls::rustls_native_certs::load_native_certs; +use deno_runtime::deno_tls::webpki_roots::TLS_SERVER_ROOTS; use deno_runtime::deno_web::BlobStore; use deno_runtime::inspector_server::InspectorServer; use deno_runtime::permissions::Permissions; -use deno_tls::rustls::RootCertStore; -use deno_tls::rustls_native_certs::load_native_certs; -use deno_tls::webpki_roots::TLS_SERVER_ROOTS; use import_map::ImportMap; use std::collections::BTreeMap; use std::collections::HashMap; diff --git a/cli/standalone.rs b/cli/standalone.rs index 92e7dfbae..464ff2c2d 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -21,13 +21,13 @@ use deno_core::v8_set_flags; use deno_core::ModuleLoader; use deno_core::ModuleSpecifier; use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel; +use deno_runtime::deno_tls::create_default_root_cert_store; use deno_runtime::deno_web::BlobStore; use deno_runtime::permissions::Permissions; use deno_runtime::permissions::PermissionsOptions; use deno_runtime::worker::MainWorker; use deno_runtime::worker::WorkerOptions; use deno_runtime::BootstrapOptions; -use deno_tls::create_default_root_cert_store; use log::Level; use std::env::current_exe; use std::fs::File; |