Skip to content

Commit

Permalink
Merge pull request #348 from fortanix/yx/fix-ci
Browse files Browse the repository at this point in the history
Fix CI

- Update branch name in CI yaml file to ensure GitHub Action is triggered.
- Update code to fix new warning from latest nightly.
  • Loading branch information
Taowyoo authored Feb 9, 2024
2 parents 391b600 + b7dd90f commit 8cd9a8d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- 'LICENSE-GPL'
branches:
- mbedtls-3
- main
- master
- 'v0.*'
merge_group:

Expand Down
4 changes: 4 additions & 0 deletions mbedtls/src/wrapper_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 8cd9a8d

Please sign in to comment.