diff options
Diffstat (limited to 'nrf-softdevice/src/util')
| -rw-r--r-- | nrf-softdevice/src/util/mod.rs | 5 | ||||
| -rw-r--r-- | nrf-softdevice/src/util/portal.rs | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/nrf-softdevice/src/util/mod.rs b/nrf-softdevice/src/util/mod.rs index c341a1d..03492d3 100644 --- a/nrf-softdevice/src/util/mod.rs +++ b/nrf-softdevice/src/util/mod.rs @@ -32,10 +32,7 @@ pub(crate) unsafe fn get_flexarray<T>( /// This function is a workaround for UB in __BindgenUnionField /// see https://github.com/rust-lang/rust-bindgen/issues/1892 /// see https://github.com/rust-lang/unsafe-code-guidelines/issues/134 -pub(crate) unsafe fn get_union_field<T>( - orig_ptr: *const raw::ble_evt_t, - member: &raw::__BindgenUnionField<T>, -) -> &T { +pub(crate) unsafe fn get_union_field<T>(orig_ptr: *const raw::ble_evt_t, member: &raw::__BindgenUnionField<T>) -> &T { let offs = member as *const _ as usize - orig_ptr as usize; let sanitized_ptr = (orig_ptr as *const u8).add(offs) as *const T; &*sanitized_ptr diff --git a/nrf-softdevice/src/util/portal.rs b/nrf-softdevice/src/util/portal.rs index bc6becd..92505a6 100644 --- a/nrf-softdevice/src/util/portal.rs +++ b/nrf-softdevice/src/util/portal.rs @@ -22,8 +22,7 @@ unsafe impl<T> Sync for Portal<T> {} fn assert_thread_mode() { assert!( - cortex_m::peripheral::SCB::vect_active() - == cortex_m::peripheral::scb::VectActive::ThreadMode, + cortex_m::peripheral::SCB::vect_active() == cortex_m::peripheral::scb::VectActive::ThreadMode, "portals are not usable from interrupts" ); } |