diff --git a/cli/args/mod.rs b/cli/args/mod.rs index b96c42ec2cef1..69d055bdfb422 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -9,7 +9,6 @@ pub mod package_json; pub use self::import_map::resolve_import_map; use self::package_json::PackageJsonDeps; -use deno_runtime::permissions::PermissionsOptions; use ::import_map::ImportMap; use deno_ast::SourceMapOption; use deno_core::resolve_url_or_path; @@ -18,6 +17,7 @@ use deno_npm::NpmSystemInfo; use deno_runtime::deno_tls::create_default_root_cert_store; use deno_runtime::deno_tls::create_platform_cert_store; use deno_runtime::deno_tls::RootCertStoreProvider; +use deno_runtime::permissions::PermissionsOptions; use deno_semver::npm::NpmPackageReqReference; use indexmap::IndexMap; diff --git a/ext/tls/lib.rs b/ext/tls/lib.rs index 560280fb5114c..bdd70caa1c4ba 100644 --- a/ext/tls/lib.rs +++ b/ext/tls/lib.rs @@ -20,13 +20,13 @@ use deno_core::anyhow::anyhow; use deno_core::error::custom_error; use deno_core::error::AnyError; -use rustls::ClientConfig; -use rustls::DigitallySignedStruct; -use rustls::Error; use rustls::client::danger::HandshakeSignatureValid; use rustls::client::danger::ServerCertVerified; use rustls::client::danger::ServerCertVerifier; use rustls::client::WebPkiServerVerifier; +use rustls::ClientConfig; +use rustls::DigitallySignedStruct; +use rustls::Error; use rustls_pemfile::certs; use rustls_pemfile::ec_private_keys; use rustls_pemfile::pkcs8_private_keys; @@ -328,9 +328,7 @@ fn cert_not_found_err() -> AnyError { } /// Starts with -----BEGIN RSA PRIVATE KEY----- -fn load_rsa_keys( - mut bytes: &[u8], -) -> Result, AnyError> { +fn load_rsa_keys(mut bytes: &[u8]) -> Result, AnyError> { let keys = rsa_private_keys(&mut bytes).map_err(|_| key_decode_err())?; Ok( keys @@ -341,9 +339,7 @@ fn load_rsa_keys( } /// Starts with -----BEGIN EC PRIVATE KEY----- -fn load_ec_keys( - mut bytes: &[u8], -) -> Result, AnyError> { +fn load_ec_keys(mut bytes: &[u8]) -> Result, AnyError> { let keys = ec_private_keys(&mut bytes).map_err(|_| key_decode_err())?; Ok( keys @@ -354,9 +350,7 @@ fn load_ec_keys( } /// Starts with -----BEGIN PRIVATE KEY----- -fn load_pkcs8_keys( - mut bytes: &[u8], -) -> Result, AnyError> { +fn load_pkcs8_keys(mut bytes: &[u8]) -> Result, AnyError> { let keys = pkcs8_private_keys(&mut bytes).map_err(|_| key_decode_err())?; Ok( keys