From 7e31862f499306dd20372faab89ae7fb8d0a4a31 Mon Sep 17 00:00:00 2001
From: Evgenii Pashkin <eapashkin@gmail.com>
Date: Fri, 2 Mar 2018 21:47:29 +0300
Subject: [PATCH] Revert "Deprecate CallbackGuard"

This reverts commit ba8b1dcb577f816b1a0c552cb300de6a8e6f5b3e.
---
 src/main_context.rs | 4 +++-
 src/signal.rs       | 2 ++
 src/source.rs       | 8 ++++----
 src/value.rs        | 4 ++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main_context.rs b/src/main_context.rs
index 4790f565..486630da 100644
--- a/src/main_context.rs
+++ b/src/main_context.rs
@@ -13,7 +13,7 @@ use MainContext;
 use Source;
 use SourceId;
 
-use source::Priority;
+use source::{CallbackGuard, Priority};
 
 impl MainContext {
     pub fn prepare(&self) -> (bool, i32) {
@@ -49,6 +49,7 @@ impl MainContext {
 
 #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 unsafe extern "C" fn trampoline<F: FnOnce() + Send + 'static>(func: gpointer) -> gboolean {
+    let _guard = CallbackGuard::new();
     let func: &mut Option<Box<F>> = transmute(func);
     let func = func.take().expect("MainContext::invoke() closure called multiple times");
     func();
@@ -56,6 +57,7 @@ unsafe extern "C" fn trampoline<F: FnOnce() + Send + 'static>(func: gpointer) ->
 }
 
 unsafe extern "C" fn destroy_closure<F: FnOnce() + Send + 'static>(ptr: gpointer) {
+    let _guard = CallbackGuard::new();
     Box::<Option<Box<F>>>::from_raw(ptr as *mut _);
 }
 
diff --git a/src/signal.rs b/src/signal.rs
index 4b89705a..afd619e8 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -9,6 +9,7 @@ use libc::{c_void, c_uint, c_ulong};
 use gobject_ffi::{self, GCallback};
 use ffi::{gboolean, GQuark};
 use object::{IsA, Object};
+use source::CallbackGuard;
 use translate::{from_glib, FromGlib, ToGlib, ToGlibPtr};
 
 /// The id of a signal that is returned by `connect`.
@@ -88,6 +89,7 @@ pub fn signal_stop_emission_by_name<T: IsA<Object>>(instance: &T, signal_name: &
 }
 
 unsafe extern "C" fn destroy_closure(ptr: *mut c_void, _: *mut gobject_ffi::GClosure) {
+    let _guard = CallbackGuard::new();
     // destroy
     Box::<Box<Fn()>>::from_raw(ptr as *mut _);
 }
diff --git a/src/source.rs b/src/source.rs
index 3f40f709..e4946068 100644
--- a/src/source.rs
+++ b/src/source.rs
@@ -54,24 +54,20 @@ impl ToGlib for Continue {
 
 /// Unwinding propagation guard. Aborts the process if destroyed while
 /// panicking.
-#[deprecated(note="Rustc has this functionality built-in since 1.24.0")]
 pub struct CallbackGuard(());
 
-#[allow(deprecated)]
 impl CallbackGuard {
     pub fn new() -> CallbackGuard {
         CallbackGuard(())
     }
 }
 
-#[allow(deprecated)]
 impl Default for CallbackGuard {
     fn default() -> Self {
         Self::new()
     }
 }
 
-#[allow(deprecated)]
 impl Drop for CallbackGuard {
     fn drop(&mut self) {
         use std::io::stderr;
@@ -86,11 +82,13 @@ impl Drop for CallbackGuard {
 
 #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 unsafe extern "C" fn trampoline(func: gpointer) -> gboolean {
+    let _guard = CallbackGuard::new();
     let func: &RefCell<Box<FnMut() -> Continue + 'static>> = transmute(func);
     (&mut *func.borrow_mut())().to_glib()
 }
 
 unsafe extern "C" fn destroy_closure(ptr: gpointer) {
+    let _guard = CallbackGuard::new();
     Box::<RefCell<Box<FnMut() -> Continue + 'static>>>::from_raw(ptr as *mut _);
 }
 
@@ -102,11 +100,13 @@ fn into_raw<F: FnMut() -> Continue + Send + 'static>(func: F) -> gpointer {
 
 #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 unsafe extern "C" fn trampoline_child_watch(pid: u32, status: i32, func: gpointer) {
+    let _guard = CallbackGuard::new();
     let func: &RefCell<Box<FnMut(u32, i32) + 'static>> = transmute(func);
     (&mut *func.borrow_mut())(pid, status)
 }
 
 unsafe extern "C" fn destroy_closure_child_watch(ptr: gpointer) {
+    let _guard = CallbackGuard::new();
     Box::<RefCell<Box<FnMut(u32, i32) + 'static>>>::from_raw(ptr as *mut _);
 }
 
diff --git a/src/value.rs b/src/value.rs
index 01c9f006..b31f04c8 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -944,11 +944,13 @@ impl AnyValue {
     }
 
     unsafe extern "C" fn copy(v: *mut c_void) -> *mut c_void {
+        let _guard = ::source::CallbackGuard::new();
         let v = &*(v as *mut AnyValue);
         Box::into_raw(Box::new(v.clone())) as *mut c_void
     }
 
     unsafe extern "C" fn free(v: *mut c_void) {
+        let _guard = ::source::CallbackGuard::new();
         let _ = Box::from_raw(v as *mut AnyValue);
     }
 }
@@ -1019,11 +1021,13 @@ impl AnySendValue {
     }
 
     unsafe extern "C" fn copy(v: *mut c_void) -> *mut c_void {
+        let _guard = ::source::CallbackGuard::new();
         let v = &*(v as *mut AnySendValue);
         Box::into_raw(Box::new(v.clone())) as *mut c_void
     }
 
     unsafe extern "C" fn free(v: *mut c_void) {
+        let _guard = ::source::CallbackGuard::new();
         let _ = Box::from_raw(v as *mut AnySendValue);
     }
 }