fix cyclic dependence

denoland · yazan-abdalrahman · Jun 2, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 4, 2024
commit 5db82f325505bfa2780a54de39f4261df1c109c6
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ext/net/lib.rs b/ext/net/lib.rs
@@ -1,6 1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-pub mod host;
 pub mod io;
 pub mod ops;
 pub mod ops_tls;
@@ -10,11 9,12 @@ pub mod raw;
 pub mod resolve_addr;
 mod tcp;
 
-use crate::host::extract_host;
-use crate::host::split_host_port;
-use crate::host::Host;
 use deno_core::error::AnyError;
 use deno_core::OpState;
 use deno_permissions::host::extract_host;
 use deno_permissions::host::split_host_port;
 use deno_permissions::host::Host;
 use deno_permissions::NetDescriptor;
 use deno_tls::rustls::RootCertStore;
 use deno_tls::RootCertStoreProvider;
 use std::path::Path;
@@ -67,12 67,18 @@ pub trait NetPermissions {
 
 impl NetPermissions for deno_permissions::PermissionsContainer {
  #[inline(always)]
- fn check_net<T: AsRef<str>>(
  fn check_net(
  &mut self,
- host: &(T, Option<u16>),
  host: &NetPermissionHost,
  api_name: &str,
  ) -> Result<(), AnyError> {
- deno_permissions::PermissionsContainer::check_net(self, host, api_name)
  let _host = host.clone().host;
  let _port = host.clone().port;
  deno_permissions::PermissionsContainer::check_net(
  self,
  &NetDescriptor(_host, _port),
  api_name,
  )
  }
 
  #[inline(always)]
@@ -217,7 223,7 @@ mod ops_unix {
 #[cfg(test)]
 mod tests {
  use super::NetPermissionHost;
- use crate::host::Host;
  use deno_permissions::host::Host;
  use fqdn::FQDN;
  use std::net::Ipv4Addr;
  use std::net::Ipv6Addr;

diff --git a/ext/net/ops.rs b/ext/net/ops.rs
@@ -14,9 14,6 @@ use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::CancelFuture;
 
-use crate::host::extract_host;
-use crate::host::split_host_port;
-use crate::host::Host;
 use deno_core::AsyncRefCell;
 use deno_core::ByteString;
 use deno_core::CancelHandle;
@@ -26,6 23,9 @@ use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
 use deno_core::ResourceId;
 use deno_permissions::host::extract_host;
 use deno_permissions::host::split_host_port;
 use deno_permissions::host::Host;
 use serde::Deserialize;
 use serde::Serialize;
 use socket2::Domain;

diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml
@@ -15,7 15,6 @@ path = "lib.rs"
 
 [dependencies]
 deno_core.workspace = true
-deno_net.workspace = true
 deno_terminal.workspace = true
 fqdn.workspace = true
 libc.workspace = true

diff --git a/ext/net/host.rs → runtime/permissions/host.rs b/ext/net/host.rs → runtime/permissions/host.rs
diff --git a/runtime/permissions/lib.rs b/runtime/permissions/lib.rs
@@ -1,5 1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 pub mod host;
 
 use deno_core::anyhow::Context;
 use deno_core::error::custom_error;
 use deno_core::error::type_error;
@@ -16,9 18,6 @@ use deno_core::url;
 use deno_core::url::ParseError;
 use deno_core::url::Url;
 use deno_core::ModuleSpecifier;
-use deno_net::host::extract_host;
-use deno_net::host::split_host_port;
-use deno_net::host::Host;
 use deno_terminal::colors;
 use once_cell::sync::Lazy;
 use std::borrow::Cow;
@@ -39,6 38,9 @@ use prompter::permission_prompt;
 use prompter::PromptResponse;
 use prompter::PERMISSION_EMOJI;
 
 use crate::host::extract_host;
 use crate::host::split_host_port;
 use crate::host::Host;
 pub use prompter::set_prompt_callbacks;
 pub use prompter::PromptCallback;