fmt

Author: GuillaumeGomez

src/main_context.rs

@@ -88,7 +88,9 @@ impl MainContext {
     {
         unsafe extern "C" fn trampoline<F: FnOnce() + 'static>(func: gpointer) -> gboolean {
             let func: &mut Option<F> = &mut *(func as *mut Option<F>);
-            let func = func.take().expect("MainContext::invoke() closure called multiple times");
+            let func = func
+                .take()
+                .expect("MainContext::invoke() closure called multiple times");
             func();
             glib_sys::G_SOURCE_REMOVE
         }

src/subclass/types.rs

@@ -1,4 +1,3 @@
->>>>>>> 9c766b7... f
 // Copyright 2017-2018, The Gtk-rs Project Developers.
 // See the COPYRIGHT file at the top-level directory of this distribution.
 // Licensed under the MIT license, see the LICENSE file or <http://opensource.org/licenses/MIT>

src/translate.rs

@@ -1854,7 +1854,8 @@ impl FromGlibPtrContainer<*const c_char, *mut glib_sys::GHashTable> for HashMap<
         ) {
             let key: String = from_glib_none(key as *const c_char);
             let value: String = from_glib_none(value as *const c_char);
-            let hash_map: &mut HashMap<String, String> = &mut *(hash_map as *mut HashMap<String, String>);
+            let hash_map: &mut HashMap<String, String> =
+                &mut *(hash_map as *mut HashMap<String, String>);
             hash_map.insert(key, value);
         }
         let mut map = HashMap::new();