Merge pull request #6 from derenv/indentation1

Indentation1

Author: derenv

src/main.rs

@@ -24,9 +24,8 @@ mod custom_button;
 mod subprocess;
 mod processor;
 
-use std::ffi::OsStr;
-
 // Imports
+use std::ffi::OsStr;
 use gtk::prelude::*;
 use gtk::{
     /* Libraries */ gio,
@@ -93,37 +92,25 @@ fn build_ui(app: &Application) {
             ],
             None::<&gio::Cancellable>,
         ) {
-            Ok(return_val) => {
-                match return_val {
-                    (None, None) => println!("no stdout or stderr, something went really wrong..."),
-                    (None, Some(stderr_buffer)) => {
-                        match std::str::from_utf8(&stderr_buffer) {
-                            Ok(stderr_buffer_contents) => println!("Process failed with error: {}", stderr_buffer_contents),
-                            Err(err) => panic!("{}", err),
-                        }
+            Ok(return_val) => match return_val {
+                (None, None) => println!("no stdout or stderr, something went really wrong..."),
+                (None, Some(stderr_buffer)) => match std::str::from_utf8(&stderr_buffer) {
+                    Ok(stderr_buffer_contents) => println!("Process failed with error: {}", stderr_buffer_contents),
+                    Err(err) => panic!("{}", err),
+                },
+                (Some(stdout_buffer), None) => match std::str::from_utf8(&stdout_buffer) {
+                    Ok(stdout_buffer_contents) => println!("Process suceeded, returning: {}", stdout_buffer_contents),
+                    Err(err) => panic!("{}", err),
+                },
+                (Some(stdout_buffer), Some(stderr_buffer)) => match std::str::from_utf8(&stdout_buffer) {
+                    Ok(stdout_buffer_contents) => match std::str::from_utf8(&stderr_buffer) {
+                        Ok(stderr_buffer_contents) => println!("Process suceeded, returning: {} but with error: {}", stdout_buffer_contents, stderr_buffer_contents),
+                        Err(err) => panic!("{}", err),
                     },
-                    (Some(stdout_buffer), None) => {
-                        match std::str::from_utf8(&stdout_buffer) {
-                            Ok(stdout_buffer_contents) => println!("Process suceeded, returning: {}", stdout_buffer_contents),
-                            Err(err) => panic!("{}", err),
-                        }
-                    },
-                    (Some(stdout_buffer), Some(stderr_buffer)) => {
-                        match std::str::from_utf8(&stdout_buffer) {
-                            Ok(stdout_buffer_contents)=> {
-                                match std::str::from_utf8(&stderr_buffer) {
-                                    Ok(stderr_buffer_contents) => println!("Process suceeded, returning: {} but with error: {}", stdout_buffer_contents, stderr_buffer_contents),
-                                    Err(err) => panic!("{}", err),
-                                }
-                            },
-                            Err(err) => panic!("{}", err),
-                        }
-                    },
-                }
-            }
-            Err(_y) => {
-                println!("something went wrong!"); //DEBUG
+                    Err(err) => panic!("{}", err),
+                },
             }
+            Err(_y) => println!("something went wrong!"), //DEBUG
         };
     });
 

src/subprocess/mod.rs

@@ -51,12 +51,10 @@ pub fn exec_check(
     // Create subprocess
     match gio::Subprocess::newv(argv, gio::SubprocessFlags::NONE) {
         Err(err) => Err(err),
-        Ok(proc) => {
-            // Run subprocess
-            match proc.wait_async(cancellable, |_| ()) {
-                _ => Ok(()),
-            }
-        }
+        // Run subprocess
+        Ok(proc) => match proc.wait_async(cancellable, |_| ()) {
+            _ => Ok(()),
+        },
     }
 }
 
@@ -87,19 +85,17 @@ pub fn exec_communicate(
     // Create subprocess
     match gio::Subprocess::newv(argv, gio::SubprocessFlags::STDOUT_PIPE) {
         Err(err) => Err(err),
-        Ok(proc) => {
-            // Run subprocess
-            match proc.communicate(None, cancellable) {
-                Err(err) => Err(err),
-                Ok(buffers) => match buffers {
-                    (None, None) => Ok((None, None)),
-                    (None, Some(stderr_buffer)) => Ok((None, Some(stderr_buffer))),
-                    (Some(stdout_buffer), None) => Ok((Some(stdout_buffer), None)),
-                    (Some(stdout_buffer), Some(stderr_buffer)) => {
-                        Ok((Some(stdout_buffer), Some(stderr_buffer)))
-                    }
-                },
-            }
-        }
+        // Run subprocess
+        Ok(proc) => match proc.communicate(None, cancellable) {
+            Err(err) => Err(err),
+            Ok(buffers) => match buffers {
+                (None, None) => Ok((None, None)),
+                (None, Some(stderr_buffer)) => Ok((None, Some(stderr_buffer))),
+                (Some(stdout_buffer), None) => Ok((Some(stdout_buffer), None)),
+                (Some(stdout_buffer), Some(stderr_buffer)) => {
+                    Ok((Some(stdout_buffer), Some(stderr_buffer)))
+                }
+            },
+        },
     }
 }