Remove Into from manual code

Author: GuillaumeGomez

src/main_context_channel.rs

@@ -444,12 +444,11 @@ impl<T> Receiver<T> {
     ///
     /// This function panics if called from a thread that is not the owner of the provided
     /// `context`, or, if `None` is provided, of the thread default main context.
-    pub fn attach<'a, P: Into<Option<&'a MainContext>>, F: FnMut(T) -> Continue + 'static>(
+    pub fn attach<F: FnMut(T) -> Continue + 'static>(
         mut self,
-        context: P,
+        context: Option<&MainContext>,
         func: F,
     ) -> SourceId {
-        let context = context.into();
         unsafe {
             let channel = self.0.take().expect("Receiver without channel");
 
@@ -499,11 +498,11 @@ impl<T> Receiver<T> {
             let source = Source::from_glib_full(mut_override(&(*source).source));
             let id = if let Some(context) = context {
                 assert!(context.is_owner());
-                source.attach(context)
+                source.attach(Some(context))
             } else {
                 let context = MainContext::ref_thread_default();
                 assert!(context.is_owner());
-                source.attach(&context)
+                source.attach(Some(&context))
             };
 
             id
@@ -577,7 +576,7 @@ mod tests {
         let sum = Rc::new(RefCell::new(0));
         let sum_clone = sum.clone();
         let l_clone = l.clone();
-        receiver.attach(&c, move |item| {
+        receiver.attach(Some(&c), move |item| {
             *sum_clone.borrow_mut() += item;
             if *sum_clone.borrow() == 6 {
                 l_clone.quit();
@@ -613,7 +612,7 @@ mod tests {
         }
 
         let helper = Helper(l.clone());
-        receiver.attach(&c, move |_| {
+        receiver.attach(Some(&c), move |_| {
             let _ = helper;
 
             Continue(true)
@@ -640,7 +639,7 @@ mod tests {
 
         let (sender, receiver) = MainContext::channel::<i32>(Priority::default());
 
-        let source_id = receiver.attach(&c, move |_| Continue(true));
+        let source_id = receiver.attach(Some(&c), move |_| Continue(true));
 
         let source = c.find_source_by_id(&source_id).unwrap();
         source.destroy();
@@ -665,7 +664,7 @@ mod tests {
 
         let dropped = Arc::new(Mutex::new(false));
         let helper = Helper(dropped.clone());
-        let source_id = receiver.attach(&c, move |_| {
+        let source_id = receiver.attach(Some(&c), move |_| {
             let _helper = &helper;
             Continue(true)
         });
@@ -692,7 +691,7 @@ mod tests {
         let sum = Rc::new(RefCell::new(0));
         let sum_clone = sum.clone();
         let l_clone = l.clone();
-        receiver.attach(&c, move |item| {
+        receiver.attach(Some(&c), move |item| {
             *sum_clone.borrow_mut() += item;
             if *sum_clone.borrow() == 6 {
                 l_clone.quit();
@@ -741,7 +740,7 @@ mod tests {
         let sum = Rc::new(RefCell::new(0));
         let sum_clone = sum.clone();
         let l_clone = l.clone();
-        receiver.attach(&c, move |item| {
+        receiver.attach(Some(&c), move |item| {
             *sum_clone.borrow_mut() += item;
             if *sum_clone.borrow() == 6 {
                 l_clone.quit();
@@ -843,7 +842,7 @@ mod tests {
         let sum = Rc::new(RefCell::new(0));
         let sum_clone = sum.clone();
         let l_clone = l.clone();
-        receiver.attach(&c, move |item| {
+        receiver.attach(Some(&c), move |item| {
             // We consumed one item so there should be one item on
             // the other receiver now.
             let _ = wait_receiver.recv().unwrap();

src/object.rs

@@ -916,8 +916,8 @@ pub trait ObjectExt: ObjectType {
     fn emit<'a, N: Into<&'a str>>(&self, signal_name: N, args: &[&ToValue]) -> Result<Option<Value>, BoolError>;
     fn disconnect(&self, handler_id: SignalHandlerId);
 
-    fn connect_notify<'a, P: Into<Option<&'a str>>, F: Fn(&Self, &::ParamSpec) + Send + Sync + 'static>(&self, name: P, f: F) -> SignalHandlerId;
-    unsafe fn connect_notify_unsafe<'a, P: Into<Option<&'a str>>, F: Fn(&Self, &::ParamSpec)>(&self, name: P, f: F) -> SignalHandlerId;
+    fn connect_notify<F: Fn(&Self, &::ParamSpec) + Send + Sync + 'static>(&self, name: Option<&str>, f: F) -> SignalHandlerId;
+    unsafe fn connect_notify_unsafe<F: Fn(&Self, &::ParamSpec)>(&self, name: Option<&str>, f: F) -> SignalHandlerId;
     fn notify<'a, N: Into<&'a str>>(&self, property_name: N);
     fn notify_by_pspec(&self, pspec: &::ParamSpec);
 
@@ -1056,13 +1056,13 @@ impl<T: ObjectType> ObjectExt for T {
         }
     }
 
-    fn connect_notify<'a, P: Into<Option<&'a str>>, F: Fn(&Self, &::ParamSpec) + Send + Sync + 'static>(&self, name: P, f: F) -> SignalHandlerId {
+    fn connect_notify<F: Fn(&Self, &::ParamSpec) + Send + Sync + 'static>(&self, name: Option<&str>, f: F) -> SignalHandlerId {
        unsafe {
             self.connect_notify_unsafe(name, f)
        }
     }
 
-    unsafe fn connect_notify_unsafe<'a, P: Into<Option<&'a str>>, F: Fn(&Self, &::ParamSpec)>(&self, name: P, f: F) -> SignalHandlerId {
+    unsafe fn connect_notify_unsafe<F: Fn(&Self, &::ParamSpec)>(&self, name: Option<&str>, f: F) -> SignalHandlerId {
         use std::mem::transmute;
 
         unsafe extern "C" fn notify_trampoline<P, F: Fn(&P, &::ParamSpec)>(this: *mut gobject_ffi::GObject, param_spec: *mut gobject_ffi::GParamSpec, f: glib_ffi::gpointer)
@@ -1071,7 +1071,6 @@ impl<T: ObjectType> ObjectExt for T {
             f(&Object::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(param_spec))
         }
 
-        let name = name.into();
         let signal_name = if let Some(name) = name {
             format!("notify::{}\0", name)
         } else {

src/param_spec.rs

@@ -83,11 +83,11 @@ impl ParamSpec {
         }
     }
 
-    //pub fn set_qdata<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, quark: /*Ignored*/glib::Quark, data: P) {
+    //pub fn set_qdata(&self, quark: /*Ignored*/glib::Quark, data: Option</*Unimplemented*/Fundamental: Pointer>) {
     //    unsafe { TODO: call ffi::g_param_spec_set_qdata() }
     //}
 
-    //pub fn set_qdata_full<P: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, quark: /*Ignored*/glib::Quark, data: P, destroy: /*Unknown conversion*//*Unimplemented*/DestroyNotify) {
+    //pub fn set_qdata_full(&self, quark: /*Ignored*/glib::Quark, data: Option</*Unimplemented*/Fundamental: Pointer>, destroy: /*Unknown conversion*//*Unimplemented*/DestroyNotify) {
     //    unsafe { TODO: call ffi::g_param_spec_set_qdata_full() }
     //}
 
@@ -185,8 +185,7 @@ impl ParamSpec {
         }
     }
 
-    pub fn string<'a, P: Into<Option<&'a str>>>(name: &str, nick: &str, blurb: &str, default_value: P, flags: ParamFlags) -> ParamSpec {
-        let default_value = default_value.into();
+    pub fn string(name: &str, nick: &str, blurb: &str, default_value: Option<&str>, flags: ParamFlags) -> ParamSpec {
         let default_value = default_value.to_glib_none();
         unsafe {
             from_glib_full(ffi::g_param_spec_string(name.to_glib_none().0, nick.to_glib_none().0, blurb.to_glib_none().0, default_value.0, flags.to_glib()))
@@ -229,9 +228,8 @@ impl ParamSpec {
         }
     }
 
-    pub fn variant<'a, P: Into<Option<&'a ::Variant>>>(name: &str, nick: &str, blurb: &str, type_: &::VariantTy, default_value: P, flags: ParamFlags) -> ParamSpec {
+    pub fn variant(name: &str, nick: &str, blurb: &str, type_: &::VariantTy, default_value: Option<&::Variant>, flags: ParamFlags) -> ParamSpec {
         unsafe {
-            let default_value = default_value.into();
             from_glib_none(ffi::g_param_spec_variant(name.to_glib_none().0, nick.to_glib_none().0, blurb.to_glib_none().0, type_.to_glib_none().0, default_value.to_glib_none().0, flags.to_glib()))
         }
     }

src/source.rs

@@ -270,7 +270,7 @@ where F: FnMut() -> Continue + 'static {
 /// process exits.
 ///
 /// `func` will be called when `pid` exits
-pub fn child_watch_add<'a, N: Into<Option<&'a str>>, F>(pid: Pid, func: F) -> SourceId
+pub fn child_watch_add<F>(pid: Pid, func: F) -> SourceId
 where F: FnMut(Pid, i32) + Send + 'static {
     unsafe {
         from_glib(glib_ffi::g_child_watch_add_full(glib_ffi::G_PRIORITY_DEFAULT, pid.0,
@@ -288,7 +288,7 @@ where F: FnMut(Pid, i32) + Send + 'static {
 ///
 /// This function panics if called from a different thread than the one that
 /// owns the main context.
-pub fn child_watch_add_local<'a, N: Into<Option<&'a str>>, F>(pid: Pid, func: F) -> SourceId
+pub fn child_watch_add_local<F>(pid: Pid, func: F) -> SourceId
 where F: FnMut(Pid, i32) + 'static {
     unsafe {
         assert!(MainContext::default().is_owner());
@@ -427,14 +427,13 @@ pub const PRIORITY_LOW: Priority = Priority(glib_ffi::G_PRIORITY_LOW);
 /// Adds a closure to be called by the main loop the return `Source` is attached to when it's idle.
 ///
 /// `func` will be called repeatedly until it returns `Continue(false)`.
-pub fn idle_source_new<'a, N: Into<Option<&'a str>>, F>(name: N, priority: Priority, func: F) -> Source
+pub fn idle_source_new<F>(name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut() -> Continue + Send + 'static {
     unsafe {
         let source = glib_ffi::g_idle_source_new();
         glib_ffi::g_source_set_callback(source, Some(trampoline::<F>), into_raw(func), Some(destroy_closure::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -450,14 +449,13 @@ where F: FnMut() -> Continue + Send + 'static {
 /// returns `Continue(false)`. Precise timing is not guaranteed, the timeout may
 /// be delayed by other events. Prefer `timeout_add_seconds` when millisecond
 /// precision is not necessary.
-pub fn timeout_source_new<'a, N: Into<Option<&'a str>>, F>(interval: u32, name: N, priority: Priority, func: F) -> Source
+pub fn timeout_source_new<F>(interval: u32, name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut() -> Continue + Send + 'static {
     unsafe {
         let source = glib_ffi::g_timeout_source_new(interval);
         glib_ffi::g_source_set_callback(source, Some(trampoline::<F>), into_raw(func), Some(destroy_closure::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -472,14 +470,13 @@ where F: FnMut() -> Continue + Send + 'static {
 /// `func` will be called repeatedly every `interval` seconds until it
 /// returns `Continue(false)`. Precise timing is not guaranteed, the timeout may
 /// be delayed by other events.
-pub fn timeout_source_new_seconds<'a, N: Into<Option<&'a str>>, F>(interval: u32, name: N, priority: Priority, func: F) -> Source
+pub fn timeout_source_new_seconds<F>(interval: u32, name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut() -> Continue + Send + 'static {
     unsafe {
         let source = glib_ffi::g_timeout_source_new_seconds(interval);
         glib_ffi::g_source_set_callback(source, Some(trampoline::<F>), into_raw(func), Some(destroy_closure::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -492,14 +489,13 @@ where F: FnMut() -> Continue + Send + 'static {
 /// process exits.
 ///
 /// `func` will be called when `pid` exits
-pub fn child_watch_source_new<'a, N: Into<Option<&'a str>>, F>(pid: Pid, name: N, priority: Priority, func: F) -> Source
+pub fn child_watch_source_new<F>(pid: Pid, name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut(Pid, i32) + Send + 'static {
     unsafe {
         let source = glib_ffi::g_child_watch_source_new(pid.0);
         glib_ffi::g_source_set_callback(source, Some(transmute(trampoline_child_watch::<F> as usize)), into_raw_child_watch(func), Some(destroy_closure_child_watch::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -514,14 +510,13 @@ where F: FnMut(Pid, i32) + Send + 'static {
 ///
 /// `func` will be called repeatedly every time `signum` is raised until it
 /// returns `Continue(false)`.
-pub fn unix_signal_source_new<'a, N: Into<Option<&'a str>>, F>(signum: i32, name: N, priority: Priority, func: F) -> Source
+pub fn unix_signal_source_new<F>(signum: i32, name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut() -> Continue + Send + 'static {
     unsafe {
         let source = glib_ffi::g_unix_signal_source_new(signum);
         glib_ffi::g_source_set_callback(source, Some(trampoline::<F>), into_raw(func), Some(destroy_closure::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -536,14 +531,13 @@ where F: FnMut() -> Continue + Send + 'static {
 ///
 /// `func` will be called repeatedly while the file descriptor matches the given IO condition
 /// until it returns `Continue(false)`.
-pub fn unix_fd_source_new<'a, N: Into<Option<&'a str>>, F>(fd: RawFd, condition: IOCondition, name: N, priority: Priority, func: F) -> Source
+pub fn unix_fd_source_new<F>(fd: RawFd, condition: IOCondition, name: Option<&str>, priority: Priority, func: F) -> Source
 where F: FnMut(RawFd, IOCondition) -> Continue + Send + 'static {
     unsafe {
         let source = glib_ffi::g_unix_fd_source_new(fd, condition.to_glib());
         glib_ffi::g_source_set_callback(source, Some(transmute(trampoline_unix_fd::<F> as usize)), into_raw_unix_fd(func), Some(destroy_closure_unix_fd::<F>));
         glib_ffi::g_source_set_priority(source, priority.to_glib());
 
-        let name = name.into();
         if let Some(name) = name {
             glib_ffi::g_source_set_name(source, name.to_glib_none().0);
         }
@@ -553,8 +547,7 @@ where F: FnMut(RawFd, IOCondition) -> Continue + Send + 'static {
 }
 
 impl Source {
-    pub fn attach<'a, P: Into<Option<&'a MainContext>>>(&self, context: P) -> SourceId {
-        let context = context.into();
+    pub fn attach(&self, context: Option<&MainContext>) -> SourceId {
         unsafe {
             from_glib(ffi::g_source_attach(self.to_glib_none().0, context.to_glib_none().0))
         }

src/utils.rs

@@ -117,13 +117,12 @@ pub fn get_current_dir() -> Option<PathBuf> {
     }
 }
 
-pub fn filename_to_uri<'a, P: AsRef<Path>, Q: Into<Option<&'a str>>>(filename: P, hostname: Q) -> Result<GString, Error> {
+pub fn filename_to_uri<P: AsRef<Path>>(filename: P, hostname: Option<&str>) -> Result<GString, Error> {
     #[cfg(windows)]
     use ffi::g_filename_to_uri_utf8 as g_filename_to_uri;
     #[cfg(not(windows))]
     use ffi::g_filename_to_uri;
 
-    let hostname = hostname.into();
     let hostname = hostname.to_glib_none();
     unsafe {
         let mut error = std::ptr::null_mut();

src/value_array.rs

@@ -28,8 +28,7 @@ impl ValueArray {
         }
     }
 
-    pub fn append<'a, P: Into<Option<&'a Value>>>(&mut self, value: P) {
-        let value = value.into();
+    pub fn append(&mut self, value: Option<&Value>) {
         let value = value.to_glib_none();
         unsafe {
             ffi::g_value_array_append(self.to_glib_none_mut().0, value.0);
@@ -42,16 +41,14 @@ impl ValueArray {
         }
     }
 
-    pub fn insert<'a, P: Into<Option<&'a Value>>>(&mut self, index_: u32, value: P) {
-        let value = value.into();
+    pub fn insert(&mut self, index_: u32, value: Option<&Value>) {
         let value = value.to_glib_none();
         unsafe {
             ffi::g_value_array_insert(self.to_glib_none_mut().0, index_, value.0);
         }
     }
 
-    pub fn prepend<'a, P: Into<Option<&'a Value>>>(&mut self, value: P) {
-        let value = value.into();
+    pub fn prepend(&mut self, value: Option<&Value>) {
         let value = value.to_glib_none();
         unsafe {
             ffi::g_value_array_prepend(self.to_glib_none_mut().0, value.0);