summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorMatan Kushner <hello@matchai.me>2019-04-12 13:10:31 -0400
committerMatan Kushner <hello@matchai.me>2019-04-12 13:10:31 -0400
commitab9ba27231c59ddfdb0b51b073835cc7d0849f80 (patch)
treeb9f1d731f8cceb21dee8220cf98773c9faaac819 /src/modules
parent99bdf27ecac655b54b03d7389b1b24970a1ec9ec (diff)
Revert "Parallelize nodejs file checks"
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/nodejs.rs14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/modules/nodejs.rs b/src/modules/nodejs.rs
index 932709f6d..87a1e4a25 100644
--- a/src/modules/nodejs.rs
+++ b/src/modules/nodejs.rs
@@ -1,13 +1,12 @@
use super::Segment;
use ansi_term::{Color, Style};
use clap::ArgMatches;
-use rayon::prelude::*;
use std::env;
use std::fs::{self, DirEntry};
use std::process::Command;
/// Creates a segment with the current Node.js version
-///
+///
/// Will display the Node.js version if any of the following criteria are met:
/// - Current directory contains a `.js` file
/// - Current directory contains a `node_modules` directory
@@ -17,13 +16,10 @@ pub fn segment(_: &ArgMatches) -> Segment {
const SECTION_COLOR: Color = Color::Green;
let current_path = env::current_dir().expect("Unable to identify current directory");
- let files = fs::read_dir(&current_path)
- .unwrap()
- .filter_map(Result::ok)
- .collect::<Vec<DirEntry>>();
+ let files = fs::read_dir(&current_path).unwrap();
// Early return if there are no JS project files
- let is_js_project = files.par_iter().any(has_js_files);
+ let is_js_project = files.filter_map(Result::ok).any(has_js_files);
if !is_js_project {
return Segment::default();
}
@@ -42,7 +38,7 @@ pub fn segment(_: &ArgMatches) -> Segment {
}
}
-fn has_js_files(dir_entry: &DirEntry) -> bool {
+fn has_js_files(dir_entry: DirEntry) -> bool {
let is_js_file = |d: &DirEntry| -> bool {
d.path().is_file() && d.path().extension().unwrap_or_default() == "js"
};
@@ -53,5 +49,5 @@ fn has_js_files(dir_entry: &DirEntry) -> bool {
d.path().is_file() && d.path().file_name().unwrap_or_default() == "package.json"
};
- is_js_file(dir_entry) || is_node_modules(dir_entry) || is_package_json(dir_entry)
+ is_js_file(&dir_entry) || is_node_modules(&dir_entry) || is_package_json(&dir_entry)
}