diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/ffi/Cargo.toml | 2 | ||||
-rw-r--r-- | ext/net/lib.rs | 12 | ||||
-rw-r--r-- | ext/net/ops.rs | 42 | ||||
-rw-r--r-- | ext/web/lib.rs | 2 |
4 files changed, 20 insertions, 38 deletions
diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index 017314477..ae62c2063 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -17,7 +17,7 @@ path = "lib.rs" deno_core.workspace = true dlopen.workspace = true dynasmrt = "1.2.3" -libffi = "3.1.0" +libffi = "3.2.0" serde.workspace = true serde-value = "0.7" serde_json = "1.0" diff --git a/ext/net/lib.rs b/ext/net/lib.rs index 912b0723e..0e3778d5a 100644 --- a/ext/net/lib.rs +++ b/ext/net/lib.rs @@ -98,12 +98,12 @@ deno_core::extension!(deno_net, ops::op_node_unstable_net_listen_udp<P>, ops::op_net_recv_udp, ops::op_net_send_udp<P>, - ops::op_net_join_multi_v4_udp<P>, - ops::op_net_join_multi_v6_udp<P>, - ops::op_net_leave_multi_v4_udp<P>, - ops::op_net_leave_multi_v6_udp<P>, - ops::op_net_set_multi_loopback_udp<P>, - ops::op_net_set_multi_ttl_udp<P>, + ops::op_net_join_multi_v4_udp, + ops::op_net_join_multi_v6_udp, + ops::op_net_leave_multi_v4_udp, + ops::op_net_leave_multi_v6_udp, + ops::op_net_set_multi_loopback_udp, + ops::op_net_set_multi_ttl_udp, ops::op_dns_resolve<P>, ops::op_set_nodelay, ops::op_set_keepalive, diff --git a/ext/net/ops.rs b/ext/net/ops.rs index 2264df867..05aa416b4 100644 --- a/ext/net/ops.rs +++ b/ext/net/ops.rs @@ -159,15 +159,12 @@ where } #[op] -async fn op_net_join_multi_v4_udp<NP>( +async fn op_net_join_multi_v4_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, address: String, multi_interface: String, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table @@ -184,15 +181,12 @@ where } #[op] -async fn op_net_join_multi_v6_udp<NP>( +async fn op_net_join_multi_v6_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, address: String, multi_interface: u32, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table @@ -208,15 +202,12 @@ where } #[op] -async fn op_net_leave_multi_v4_udp<NP>( +async fn op_net_leave_multi_v4_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, address: String, multi_interface: String, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table @@ -233,15 +224,12 @@ where } #[op] -async fn op_net_leave_multi_v6_udp<NP>( +async fn op_net_leave_multi_v6_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, address: String, multi_interface: u32, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table @@ -257,15 +245,12 @@ where } #[op] -async fn op_net_set_multi_loopback_udp<NP>( +async fn op_net_set_multi_loopback_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, is_v4_membership: bool, loopback: bool, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table @@ -283,14 +268,11 @@ where } #[op] -async fn op_net_set_multi_ttl_udp<NP>( +async fn op_net_set_multi_ttl_udp( state: Rc<RefCell<OpState>>, rid: ResourceId, ttl: u32, -) -> Result<(), AnyError> -where - NP: NetPermissions + 'static, -{ +) -> Result<(), AnyError> { let resource = state .borrow_mut() .resource_table diff --git a/ext/web/lib.rs b/ext/web/lib.rs index adbc9f262..b1e0dd5d8 100644 --- a/ext/web/lib.rs +++ b/ext/web/lib.rs @@ -142,7 +142,7 @@ fn op_base64_atob(mut s: ByteString) -> Result<ByteString, AnyError> { fn forgiving_base64_decode_inplace( input: &mut [u8], ) -> Result<usize, AnyError> { - let error: _ = + let error = || DomExceptionInvalidCharacterError::new("Failed to decode base64"); let decoded = base64_simd::forgiving_decode_inplace(input).map_err(|_| error())?; |