From e82247401102c75cf601ea401d0f4f6215503e84 Mon Sep 17 00:00:00 2001 From: Yuxiang Cao Date: Fri, 9 Feb 2024 12:05:20 -0800 Subject: [PATCH 1/2] ci: correct branch name on pr --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bdb6a7317..d2f68b2da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ on: - 'LICENSE-GPL' branches: - mbedtls-3 - - main + - master - 'v0.*' merge_group: From b7dd90faa428b0af93b9bd62b85fd407010fda3e Mon Sep 17 00:00:00 2001 From: Yuxiang Cao Date: Fri, 9 Feb 2024 13:13:50 -0800 Subject: [PATCH 2/2] fix new nightly warning --- mbedtls/src/wrapper_macros.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mbedtls/src/wrapper_macros.rs b/mbedtls/src/wrapper_macros.rs index 6dbeb52a6..29219d0dd 100644 --- a/mbedtls/src/wrapper_macros.rs +++ b/mbedtls/src/wrapper_macros.rs @@ -17,8 +17,10 @@ macro_rules! callback { //}; { $n:ident, $m:ident($($arg:ident: $ty:ty),*) -> $ret:ty } => { pub trait $n: Send + Sync { + #[allow(dead_code)] unsafe extern "C" fn call_mut(user_data: *mut ::mbedtls_sys::types::raw_types::c_void, $($arg:$ty),*) -> $ret where Self: Sized; + #[allow(dead_code)] fn data_ptr_mut(&mut self) -> *mut ::mbedtls_sys::types::raw_types::c_void; } @@ -33,8 +35,10 @@ macro_rules! callback { } pub trait $m: Send + Sync { + #[allow(dead_code)] unsafe extern "C" fn call(user_data: *mut ::mbedtls_sys::types::raw_types::c_void, $($arg:$ty),*) -> $ret where Self: Sized; + #[allow(dead_code)] fn data_ptr(&self) -> *mut ::mbedtls_sys::types::raw_types::c_void; }