diff options
author | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-01-07 21:37:57 -0500 |
---|---|---|
committer | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-01-07 21:37:57 -0500 |
commit | 77b0e3a20255fa1929bf8ae7953f63baa0e1e35b (patch) | |
tree | 62aa148cafe9c5c7d2f4b96939670926b91d30f3 | |
parent | 8ca9278a7e96eb8508fbcb36d901719d2b25ebeb (diff) |
clean up code
-rw-r--r-- | src/joshuto/structs.rs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/joshuto/structs.rs b/src/joshuto/structs.rs index a29713d..05a7315 100644 --- a/src/joshuto/structs.rs +++ b/src/joshuto/structs.rs @@ -81,7 +81,6 @@ impl JoshutoDirList { pub fn new(path: path::PathBuf, sort_type: &sort::SortType) -> Result<Self, std::io::Error> { let mut contents = Self::read_dir_list(path.as_path(), sort_type)?; - contents.sort_by(&sort_type.compare_func()); let index = if contents.len() > 0 { @@ -163,17 +162,11 @@ impl JoshutoDirList { { let filter_func = sort_type.filter_func(); - match fs::read_dir(path) { - Ok(results) => { - let mut result_vec : Vec<JoshutoDirEntry> = results - .filter_map(filter_func) - .collect(); - Ok(result_vec) - }, - Err(e) => { - Err(e) - }, - } + let results = fs::read_dir(path)?; + let result_vec : Vec<JoshutoDirEntry> = results + .filter_map(filter_func) + .collect(); + Ok(result_vec) } pub fn get_curr_entry(&self) -> Option<&JoshutoDirEntry> |