diff options
| author | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-02-20 19:54:37 -0500 |
|---|---|---|
| committer | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-02-20 19:54:37 -0500 |
| commit | c7497dd187e9729aef2630f22b481d02864ad3bb (patch) | |
| tree | d48a7034209d27c4e3d686764d431466044d5bc7 /src/commands/parent_directory.rs | |
| parent | f75182734a5bec0987b424aff28e2ed0acf2fe38 (diff) | |
cargo fmt
Diffstat (limited to 'src/commands/parent_directory.rs')
| -rw-r--r-- | src/commands/parent_directory.rs | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/src/commands/parent_directory.rs b/src/commands/parent_directory.rs index 82afe95..7dc2f1e 100644 --- a/src/commands/parent_directory.rs +++ b/src/commands/parent_directory.rs @@ -21,40 +21,38 @@ impl ParentDirectory { match std::env::set_current_dir(&context.curr_tab_ref().curr_path) { Ok(_) => { - { - let curr_tab = &mut context.tabs[context.curr_tab_index]; + let curr_tab = &mut context.tabs[context.curr_tab_index]; - let curr_list = curr_tab.curr_list.take(); - curr_tab.history.put_back(curr_list); - let parent_list = curr_tab.parent_list.take(); - curr_tab.curr_list = parent_list; + let curr_list = curr_tab.curr_list.take(); + curr_tab.history.put_back(curr_list); + let parent_list = curr_tab.parent_list.take(); + curr_tab.curr_list = parent_list; - match curr_tab.curr_path.parent() { - Some(parent) => { - curr_tab.parent_list = match curr_tab - .history - .pop_or_create(&parent, &context.config_t.sort_type) - { - Ok(s) => Some(s), - Err(e) => { - ui::wprint_err(&context.views.left_win, e.to_string().as_str()); - None - } - }; - } - None => { - ncurses::werase(context.views.left_win.win); - ncurses::wnoutrefresh(context.views.left_win.win); - } + match curr_tab.curr_path.parent() { + Some(parent) => { + curr_tab.parent_list = match curr_tab + .history + .pop_or_create(&parent, &context.config_t.sort_type) + { + Ok(s) => Some(s), + Err(e) => { + ui::wprint_err(&context.views.left_win, e.to_string().as_str()); + None + } + }; + } + None => { + ncurses::werase(context.views.left_win.win); + ncurses::wnoutrefresh(context.views.left_win.win); } - curr_tab.refresh( - &context.views, - &context.config_t, - &context.username, - &context.hostname, - ); - preview::preview_file(curr_tab, &context.views, &context.config_t); } + curr_tab.refresh( + &context.views, + &context.config_t, + &context.username, + &context.hostname, + ); + preview::preview_file(curr_tab, &context.views, &context.config_t); } Err(e) => { ui::wprint_err(&context.views.bot_win, e.to_string().as_str()); |