Merge pull request #827 from sdroege/rustfmt

Format code with rustfmt

Author: GuillaumeGomez

.travis.yml

@@ -52,6 +52,7 @@ before_install:
 script:
   - rustc --version
   - if [ "$TRAVIS_RUST_VERSION" == "nightly" ] && [ "$GTK" == "3.14" ]; then
+    rustup component add rustfmt;
     make regen_check;
     fi
   - ./check_init_asserts

Makefile

@@ -5,6 +5,7 @@ GIR_FILES = gir-files/Gtk-3.0.gir
 
 # Run `gir` generating the bindings
 gir : src/auto/mod.rs
+	cargo fmt
 
 doc: $(GIR) $(GIR_FILES)
 	$(GIR) -m doc -c Gir.toml
@@ -15,6 +16,7 @@ not_bound: $(GIR) $(GIR_FILES)
 regen_check: $(GIR) $(GIR_FILES)
 	rm src/auto/*
 	$(GIR) -c Gir.toml
+	cargo fmt
 	git diff -R --exit-code
 
 src/auto/mod.rs : Gir.toml $(GIR) $(GIR_FILES)

build.rs

@@ -8,27 +8,24 @@ fn main() {
 }
 
 #[cfg(any(feature = "embed-lgpl-docs", feature = "purge-lgpl-docs"))]
-fn manage_docs () {
+fn manage_docs() {
     extern crate lgpl_docs;
     const PATH: &'static str = "src";
-    const IGNORES: &'static [&'static str] = &[
-        "lib.rs",
-        "prelude.rs",
-        "rt.rs",
-        "signal.rs",
-    ];
+    const IGNORES: &'static [&'static str] = &["lib.rs", "prelude.rs", "rt.rs", "signal.rs"];
     lgpl_docs::purge(PATH, IGNORES);
     if cfg!(feature = "embed-lgpl-docs") {
         lgpl_docs::embed(lgpl_docs::Library::Gtk, PATH, IGNORES);
     }
 }
 
 #[cfg(not(any(feature = "embed-lgpl-docs", feature = "purge-lgpl-docs")))]
-fn manage_docs() { }
+fn manage_docs() {}
 
 #[cfg(target_os = "macos")]
 fn build_foreground() {
-    cc::Build::new().file("src/foreground.m").compile("foreground");
+    cc::Build::new()
+        .file("src/foreground.m")
+        .compile("foreground");
     println!("cargo:rustc-link-lib=framework=AppKit");
     println!("cargo:rustc-link-lib=framework=CoreFoundation");
 }

src/app_chooser.rs

@@ -24,13 +24,18 @@ pub trait AppChooserExt: 'static {
 
 impl<O: IsA<AppChooser>> AppChooserExt for O {
     fn get_app_info(&self) -> Option<AppInfo> {
-        unsafe { from_glib_full(gtk_sys::gtk_app_chooser_get_app_info(self.as_ref().to_glib_none().0)) }
+        unsafe {
+            from_glib_full(gtk_sys::gtk_app_chooser_get_app_info(
+                self.as_ref().to_glib_none().0,
+            ))
+        }
     }
 
     fn get_content_type(&self) -> Option<String> {
         unsafe {
-            from_glib_full(
-                gtk_sys::gtk_app_chooser_get_content_type(self.as_ref().to_glib_none().0))
+            from_glib_full(gtk_sys::gtk_app_chooser_get_content_type(
+                self.as_ref().to_glib_none().0,
+            ))
         }
     }
 

src/application.rs

@@ -1,18 +1,22 @@
 use gio::ApplicationFlags;
 use glib;
 use glib::translate::*;
-use rt;
 use gtk_sys;
+use rt;
 use Application;
 
 impl Application {
-    pub fn new(application_id: Option<&str>, flags: ApplicationFlags) -> Result<Application, glib::BoolError> {
+    pub fn new(
+        application_id: Option<&str>,
+        flags: ApplicationFlags,
+    ) -> Result<Application, glib::BoolError> {
         skip_assert_initialized!();
         try!(rt::init());
         unsafe {
-            Option::from_glib_full(
-                gtk_sys::gtk_application_new(application_id.to_glib_none().0, flags.to_glib())
-            )
+            Option::from_glib_full(gtk_sys::gtk_application_new(
+                application_id.to_glib_none().0,
+                flags.to_glib(),
+            ))
             .ok_or_else(|| glib_bool_error!("Failed to create application"))
         }
     }

src/application_window.rs

@@ -10,7 +10,10 @@ impl ApplicationWindow {
     pub fn new<P: IsA<Application>>(application: &P) -> ApplicationWindow {
         skip_assert_initialized!();
         unsafe {
-            Widget::from_glib_none(gtk_sys::gtk_application_window_new(application.as_ref().to_glib_none().0)).unsafe_cast()
+            Widget::from_glib_none(gtk_sys::gtk_application_window_new(
+                application.as_ref().to_glib_none().0,
+            ))
+            .unsafe_cast()
         }
     }
 }