summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2024-04-13 01:15:38 +0530
committerGitHub <noreply@github.com>2024-04-12 21:45:38 +0200
commitc56f2e0fc04f12d3a69c1892d8866323995f3be4 (patch)
treef7bb0d74b09e0627bd21028b7a1f9ff71ed1d136 /ext
parent4b62cb54dd135dce494dfe9ddadb87143caf8aa4 (diff)
chore: upgrade deno_core to 0.274.0 (#23344)
Signed-off-by: Divy Srivastava <dj.srivastava23@gmail.com>
Diffstat (limited to 'ext')
-rw-r--r--ext/io/lib.rs3
-rw-r--r--ext/net/ops.rs35
2 files changed, 33 insertions, 5 deletions
diff --git a/ext/io/lib.rs b/ext/io/lib.rs
index 8d80eec25..04ed58ef2 100644
--- a/ext/io/lib.rs
+++ b/ext/io/lib.rs
@@ -11,7 +11,6 @@ use deno_core::BufMutView;
use deno_core::BufView;
use deno_core::CancelHandle;
use deno_core::CancelTryFuture;
-use deno_core::Op;
use deno_core::OpState;
use deno_core::RcRef;
use deno_core::Resource;
@@ -102,7 +101,7 @@ deno_core::extension!(deno_io,
stdio: Option<Stdio>,
},
middleware = |op| match op.name {
- "op_print" => op_print::DECL,
+ "op_print" => op_print(),
_ => op,
},
state = |state, options| {
diff --git a/ext/net/ops.rs b/ext/net/ops.rs
index a25b6c310..535e4b0cb 100644
--- a/ext/net/ops.rs
+++ b/ext/net/ops.rs
@@ -298,6 +298,17 @@ pub async fn op_net_connect_tcp<NP>(
where
NP: NetPermissions + 'static,
{
+ op_net_connect_tcp_inner::<NP>(state, addr).await
+}
+
+#[inline]
+pub async fn op_net_connect_tcp_inner<NP>(
+ state: Rc<RefCell<OpState>>,
+ addr: IpAddr,
+) -> Result<(ResourceId, IpAddr, IpAddr), AnyError>
+where
+ NP: NetPermissions + 'static,
+{
{
let mut state_ = state.borrow_mut();
state_
@@ -627,6 +638,15 @@ pub fn op_set_nodelay(
#[smi] rid: ResourceId,
nodelay: bool,
) -> Result<(), AnyError> {
+ op_set_nodelay_inner(state, rid, nodelay)
+}
+
+#[inline]
+pub fn op_set_nodelay_inner(
+ state: &mut OpState,
+ rid: ResourceId,
+ nodelay: bool,
+) -> Result<(), AnyError> {
let resource: Rc<TcpStreamResource> =
state.resource_table.get::<TcpStreamResource>(rid)?;
resource.set_nodelay(nodelay)
@@ -638,6 +658,15 @@ pub fn op_set_keepalive(
#[smi] rid: ResourceId,
keepalive: bool,
) -> Result<(), AnyError> {
+ op_set_keepalive_inner(state, rid, keepalive)
+}
+
+#[inline]
+pub fn op_set_keepalive_inner(
+ state: &mut OpState,
+ rid: ResourceId,
+ keepalive: bool,
+) -> Result<(), AnyError> {
let resource: Rc<TcpStreamResource> =
state.resource_table.get::<TcpStreamResource>(rid)?;
resource.set_keepalive(keepalive)
@@ -969,7 +998,7 @@ mod tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn tcp_set_no_delay() {
let set_nodelay = Box::new(|state: &mut OpState, rid| {
- op_set_nodelay::call(state, rid, true).unwrap();
+ op_set_nodelay_inner(state, rid, true).unwrap();
});
let test_fn = Box::new(|socket: SockRef| {
assert!(socket.nodelay().unwrap());
@@ -981,7 +1010,7 @@ mod tests {
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn tcp_set_keepalive() {
let set_keepalive = Box::new(|state: &mut OpState, rid| {
- op_set_keepalive::call(state, rid, true).unwrap();
+ op_set_keepalive_inner(state, rid, true).unwrap();
});
let test_fn = Box::new(|socket: SockRef| {
assert!(!socket.nodelay().unwrap());
@@ -1032,7 +1061,7 @@ mod tests {
};
let mut connect_fut =
- op_net_connect_tcp::<TestPermission>::call(conn_state, ip_addr)
+ op_net_connect_tcp_inner::<TestPermission>(conn_state, ip_addr)
.boxed_local();
let mut rid = None;