From d27812f81964e09e040110575f8cb8d59357e2ba Mon Sep 17 00:00:00 2001
From: Benjamin Sago <ogham@bsago.me>
Date: Wed, 5 Jul 2017 08:21:24 +0100
Subject: [PATCH] Environment Default trait
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Environment struct only used the Default trait so it could have the same call for both Environment<UsersCache> and Environment<MockUsers>. There’s no reason to keep it around anymore.
---
 src/output/details.rs      | 2 +-
 src/output/grid_details.rs | 2 +-
 src/output/table.rs        | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/output/details.rs b/src/output/details.rs
index 960b0c6..da78680 100644
--- a/src/output/details.rs
+++ b/src/output/details.rs
@@ -140,7 +140,7 @@ impl<'a> Render<'a> {
         let mut rows = Vec::new();
 
         if let Some(columns) = self.opts.columns {
-            let env = Environment::default();
+            let env = Environment::load_all();
             let colz = columns.for_dir(self.dir);
             let mut table = Table::new(&colz, &self.colours, &env);
 
diff --git a/src/output/grid_details.rs b/src/output/grid_details.rs
index d889507..3d30cb0 100644
--- a/src/output/grid_details.rs
+++ b/src/output/grid_details.rs
@@ -47,7 +47,7 @@ impl<'a> Render<'a> {
             None => Vec::new(),
         };
 
-        let env = Environment::default();
+        let env = Environment::load_all();
 
         let drender = self.clone().details();
 
diff --git a/src/output/table.rs b/src/output/table.rs
index ae6e6af..6e5c80c 100644
--- a/src/output/table.rs
+++ b/src/output/table.rs
@@ -41,10 +41,8 @@ impl Environment {
     pub fn lock_users(&self) -> MutexGuard<UsersCache> {
         self.users.lock().unwrap()
     }
-}
 
-impl Default for Environment {
-    fn default() -> Self {
+    pub fn load_all() -> Self {
         let tz = match determine_time_zone() {
             Ok(t) => Some(t),
             Err(ref e) => {