move hostname and username out of Context and into a static global

1 files changed, 16 insertions, 14 deletions

diff --git a/src/history.rs b/src/history.rs
index 7c6076f..0f604c3 100644
--- a/src/history.rs
+++ b/src/history.rs
@@ -26,24 +26,26 @@ impl DirectoryHistory for JoshutoHistory {
         let mut ancestors = pathbuf.ancestors();
         match ancestors.next() {
             None => {}
-            Some(mut ancestor) => for curr in ancestors {
-                match JoshutoDirList::new(curr.to_path_buf().clone(), sort_option) {
-                    Ok(mut s) => {
-                        let index = s.contents.iter().enumerate().find_map(|(i, dir)| {
-                            if dir.path == ancestor {
-                                Some(i)
-                            } else {
-                                None
+            Some(mut ancestor) => {
+                for curr in ancestors {
+                    match JoshutoDirList::new(curr.to_path_buf().clone(), sort_option) {
+                        Ok(mut s) => {
+                            let index = s.contents.iter().enumerate().find_map(|(i, dir)| {
+                                if dir.path == ancestor {
+                                    Some(i)
+                                } else {
+                                    None
+                                }
+                            });
+                            if let Some(i) = index {
+                                s.index = Some(i);
                             }
-                        });
-                        if let Some(i) = index {
-                            s.index = Some(i);
+                            self.insert(curr.to_path_buf(), s);
                         }
-                        self.insert(curr.to_path_buf(), s);
+                        Err(e) => eprintln!("populate_to_root: {}", e),
                     }
-                    Err(e) => eprintln!("populate_to_root: {}", e),
+                    ancestor = curr;
                 }
-                ancestor = curr;
             }
         }
     }