Skip to content

Commit 2967438

Browse files
authored
Merge pull request #1666 from BiagioFesta/wip/bfesta/remove-unsafe-to-ptr
Remove unsafe interface requirement for into ptr conversion
2 parents c10cbc1 + b307d29 commit 2967438

23 files changed

+40
-40
lines changed

cairo/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub struct Context(ptr::NonNull<ffi::cairo_t>);
6060
#[cfg_attr(docsrs, doc(cfg(feature = "use_glib")))]
6161
impl IntoGlibPtr<*mut ffi::cairo_t> for Context {
6262
#[inline]
63-
unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_t {
63+
fn into_glib_ptr(self) -> *mut ffi::cairo_t {
6464
(&*std::mem::ManuallyDrop::new(self)).to_glib_none().0
6565
}
6666
}

cairo/src/device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ impl Device {
317317
#[cfg_attr(docsrs, doc(cfg(feature = "use_glib")))]
318318
impl IntoGlibPtr<*mut ffi::cairo_device_t> for Device {
319319
#[inline]
320-
unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_device_t {
320+
fn into_glib_ptr(self) -> *mut ffi::cairo_device_t {
321321
std::mem::ManuallyDrop::new(self).to_glib_none().0
322322
}
323323
}

cairo/src/region.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct Region(ptr::NonNull<ffi::cairo_region_t>);
1717
#[cfg(feature = "use_glib")]
1818
impl IntoGlibPtr<*mut ffi::cairo_region_t> for Region {
1919
#[inline]
20-
unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_region_t {
20+
fn into_glib_ptr(self) -> *mut ffi::cairo_region_t {
2121
(&*std::mem::ManuallyDrop::new(self)).to_glib_none().0
2222
}
2323
}

cairo/src/surface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl Surface {
292292
#[cfg(feature = "use_glib")]
293293
impl IntoGlibPtr<*mut ffi::cairo_surface_t> for Surface {
294294
#[inline]
295-
unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_surface_t {
295+
fn into_glib_ptr(self) -> *mut ffi::cairo_surface_t {
296296
std::mem::ManuallyDrop::new(self).to_glib_none().0
297297
}
298298
}

cairo/src/surface_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ macro_rules! declare_surface {
4141
#[cfg(feature = "use_glib")]
4242
impl IntoGlibPtr<*mut crate::ffi::cairo_surface_t> for $surf_name {
4343
#[inline]
44-
unsafe fn into_glib_ptr(self) -> *mut crate::ffi::cairo_surface_t {
44+
fn into_glib_ptr(self) -> *mut crate::ffi::cairo_surface_t {
4545
std::mem::ManuallyDrop::new(self).to_glib_none().0
4646
}
4747
}

glib-macros/src/boxed_derive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ pub fn impl_boxed(input: &syn::DeriveInput) -> syn::Result<TokenStream> {
241241

242242
impl #crate_ident::translate::IntoGlibPtr<*mut #name> for #name {
243243
#[inline]
244-
unsafe fn into_glib_ptr(self) -> *mut #name {
244+
fn into_glib_ptr(self) -> *mut #name {
245245
::std::boxed::Box::into_raw(::std::boxed::Box::new(self)) as *mut _
246246
}
247247
}

glib-macros/src/shared_boxed_derive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub fn impl_shared_boxed(input: &syn::DeriveInput) -> syn::Result<proc_macro2::T
262262

263263
impl #crate_ident::translate::IntoGlibPtr<*mut #refcounted_type_prefix::InnerType> for #name {
264264
#[inline]
265-
unsafe fn into_glib_ptr(self) -> *mut #refcounted_type_prefix::InnerType {
265+
fn into_glib_ptr(self) -> *mut #refcounted_type_prefix::InnerType {
266266
let r = <Self as #crate_ident::subclass::shared::SharedType>::into_refcounted(self);
267267
#refcounted_type_prefix::into_raw(r) as *mut _
268268
}

glib/src/boxed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ macro_rules! glib_boxed_wrapper {
306306
#[doc(hidden)]
307307
impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? $crate::translate::IntoGlibPtr<*mut $ffi_name> for $name $(<$($generic),+>)? {
308308
#[inline]
309-
unsafe fn into_glib_ptr(self) -> *mut $ffi_name {
309+
fn into_glib_ptr(self) -> *mut $ffi_name {
310310
let s = std::mem::ManuallyDrop::new(self);
311311
$crate::translate::ToGlibPtr::<*const $ffi_name>::to_glib_none(&*s).0 as *mut _
312312
}
@@ -315,7 +315,7 @@ macro_rules! glib_boxed_wrapper {
315315
#[doc(hidden)]
316316
impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? $crate::translate::IntoGlibPtr<*const $ffi_name> for $name $(<$($generic),+>)? {
317317
#[inline]
318-
unsafe fn into_glib_ptr(self) -> *const $ffi_name {
318+
fn into_glib_ptr(self) -> *const $ffi_name {
319319
let s = std::mem::ManuallyDrop::new(self);
320320
$crate::translate::ToGlibPtr::<*const $ffi_name>::to_glib_none(&*s).0 as *const _
321321
}

glib/src/boxed_inline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,15 +538,15 @@ macro_rules! glib_boxed_inline_wrapper {
538538
#[doc(hidden)]
539539
impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? $crate::translate::IntoGlibPtr<*mut $ffi_name> for $name $(<$($generic),+>)? {
540540
#[inline]
541-
unsafe fn into_glib_ptr(self) -> *mut $ffi_name {
541+
fn into_glib_ptr(self) -> *mut $ffi_name {
542542
$crate::translate::ToGlibPtr::<*const $ffi_name>::to_glib_full(&self) as *mut _
543543
}
544544
}
545545

546546
#[doc(hidden)]
547547
impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? $crate::translate::IntoGlibPtr<*const $ffi_name> for $name $(<$($generic),+>)? {
548548
#[inline]
549-
unsafe fn into_glib_ptr(self) -> *const $ffi_name {
549+
fn into_glib_ptr(self) -> *const $ffi_name {
550550
$crate::translate::ToGlibPtr::<*const $ffi_name>::to_glib_full(&self)
551551
}
552552
}

glib/src/collections/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ impl<'a, T: TransparentPtrType + 'a> ToGlibPtrMut<'a, *mut ffi::GList> for List<
621621

622622
impl<T: TransparentPtrType> IntoGlibPtr<*mut ffi::GList> for List<T> {
623623
#[inline]
624-
unsafe fn into_glib_ptr(self) -> *mut ffi::GList {
624+
fn into_glib_ptr(self) -> *mut ffi::GList {
625625
self.into_raw()
626626
}
627627
}

0 commit comments

Comments
 (0)