style: reformat code

g-plane · Mar 21, 2018 · a108d08 · a108d08
1 parent e18c303
commit a108d08
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 58 deletions.
diff --git a/yarn-deps/src/main.rs b/yarn-deps/src/main.rs
@@ -12,7 +12,7 @@ extern crate serde_derive;
 #[derive(Deserialize)]
 struct Pkg {
     dependencies: Option<HashMap<String, String>>,
-    devDependencies: Option<HashMap<String, String>>
+    devDependencies: Option<HashMap<String, String>>,
 }
 
 fn fetch_installed_packages() -> String {
@@ -21,75 +21,65 @@ fn fetch_installed_packages() -> String {
         Ok(pwd) => {
             path.push_str(&pwd);
             path.push_str("/package.json");
-        },
+        }
         Err(_) => {
             return String::new();
         }
     }
 
     match File::open(path) {
-        Ok(file) => {
-            match serde_json::from_reader(file) {
-                Ok(pkg) => {
-                    let mut packages: Vec<String> = Vec::new();
-                    let pkg: Pkg = pkg;
+        Ok(file) => match serde_json::from_reader(file) {
+            Ok(pkg) => {
+                let mut packages: Vec<String> = Vec::new();
+                let pkg: Pkg = pkg;
 
-                    match pkg.dependencies {
-                        Some(dependencies) => {
-                            dependencies
-                                .keys()
-                                .for_each(|package| packages.push(package.to_string()));
-                        },
-                        None => (),
-                    };
-                    match pkg.devDependencies {
-                        Some(dev_dependencies) => {
-                            dev_dependencies
-                                .keys()
-                                .for_each(|package| packages.push(package.to_string()));
-                        },
-                        None => (),
-                    };
+                match pkg.dependencies {
+                    Some(dependencies) => {
+                        dependencies
+                            .keys()
+                            .for_each(|package| packages.push(package.to_string()));
+                    }
+                    None => (),
+                };
+                match pkg.devDependencies {
+                    Some(dev_dependencies) => {
+                        dev_dependencies
+                            .keys()
+                            .for_each(|package| packages.push(package.to_string()));
+                    }
+                    None => (),
+                };
 
-                    packages.iter().fold(
-                        String::new(),
-                        |acc, package| acc + &package + "\n"
-                    )
-                },
-                Err(_) => String::new()
+                packages
+                    .iter()
+                    .fold(String::new(), |acc, package| acc + &package + "\n")
             }
+            Err(_) => String::new(),
         },
-        Err(_) => String::new()
+        Err(_) => String::new(),
     }
 }
 
 fn main() {
-    let dependencies = [
-        "vue",
-        "vuex"
-    ];
+    let dependencies = ["vue", "vuex"];
 
-    let dev_dependencies = [
-        "typescript",
-        "eslint",
-        "eslint-config-gplane"
-    ];
+    let dev_dependencies = ["typescript", "eslint", "eslint-config-gplane"];
 
     match env::args().find(|arg| arg == "remove") {
         Some(_) => {
             print!("{}", fetch_installed_packages());
             return;
-        },
+        }
         None => (),
     };
 
     match env::args().find(|arg| arg == "dev") {
         Some(_) => {
             dev_dependencies.iter().for_each(|&dep| println!("{}", dep));
-        },
+        }
         None => {
             dependencies.iter().for_each(|&dep| println!("{}", dep));
-        },
+        }
     };
 }
 

diff --git a/yarn-scripts/src/main.rs b/yarn-scripts/src/main.rs
@@ -10,7 +10,7 @@ extern crate serde_derive;
 
 #[derive(Deserialize)]
 struct Pkg {
-    scripts: Option<HashMap<String, String>>
+    scripts: Option<HashMap<String, String>>,
 }
 
 fn fetch_npm_scripts() -> String {
@@ -19,28 +19,25 @@ fn fetch_npm_scripts() -> String {
         Ok(pwd) => {
             path.push_str(&pwd);
             path.push_str("/package.json");
-        },
+        }
         Err(_) => {
             return String::new();
         }
     }
     match File::open(path) {
-        Ok(file) => {
-            match serde_json::from_reader(file) {
-                Ok(package) => {
-                    let package: Pkg = package;
-                    match package.scripts {
-                        Some(scripts) => scripts.keys().fold(
-                            String::new(),
-                            |acc, script| acc + &script + "\n"
-                        ),
-                        None => String::new()
-                    }
-                },
-                Err(_) => String::new()
+        Ok(file) => match serde_json::from_reader(file) {
+            Ok(package) => {
+                let package: Pkg = package;
+                match package.scripts {
+                    Some(scripts) => scripts
+                        .keys()
+                        .fold(String::new(), |acc, script| acc + &script + "\n"),
+                    None => String::new(),
+                }
             }
+            Err(_) => String::new(),
         },
-        Err(_) => String::new()
+        Err(_) => String::new(),
     }
 }