From 43f6565fa546178a1f9771cbf3940be74c970cfc Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Sun, 30 Sep 2018 16:36:00 -0700
Subject: [PATCH] Update to log 0.4.5

https://github.com/iceiix/steven/issues/4
---
 Cargo.lock         |  2 +-
 Cargo.toml         |  2 +-
 src/console/mod.rs | 29 ++++++++++++++++-------------
 src/main.rs        |  6 ++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d55aa2..8a43b2a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -736,7 +736,7 @@ dependencies = [
  "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 3a6b82e..073459f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ zip = "0.4.2"
 image = "0.7.0"
 rand = "0.3.14"
 rustc-serialize = "0.3.24"
-log = "0.3.5"
+log = "0.4.5"
 cgmath = "0.7.0"
 lazy_static = "0.1.15"
 collision = {git = "https://github.com/TheUnnamedDude/collision-rs", rev = "f80825e"}
diff --git a/src/console/mod.rs b/src/console/mod.rs
index d3703d9..0474ebf 100644
--- a/src/console/mod.rs
+++ b/src/console/mod.rs
@@ -273,21 +273,21 @@ impl Console {
         }
     }
 
-    fn log(&mut self, record: &log::LogRecord) {
+    fn log(&mut self, record: &log::Record) {
         for filtered in FILTERED_CRATES {
-            if record.location().module_path().starts_with(filtered) {
+            if record.module_path().unwrap_or("").starts_with(filtered) {
                 return;
             }
         }
 
-        let mut file = &record.location().file().replace("\\", "/")[..];
+        let mut file = &record.file().unwrap_or("").replace("\\", "/")[..];
         if let Some(pos) = file.rfind("src/") {
             file = &file[pos + 4..];
         }
 
         println!("[{}:{}][{}] {}",
                  file,
-                 record.location().line(),
+                 record.line().unwrap_or(0),
                  record.level(),
                  record.args());
         self.history.remove(0);
@@ -301,7 +301,7 @@ impl Console {
             },
             Component::Text(TextComponent::new(":")),
             {
-                let mut msg = TextComponent::new(&format!("{}", record.location().line()));
+                let mut msg = TextComponent::new(&format!("{}", record.line().unwrap_or(0)));
                 msg.modifier.color = Some(Color::Aqua);
                 Component::Text(msg)
             },
@@ -310,11 +310,11 @@ impl Console {
             {
                 let mut msg = TextComponent::new(&format!("{}", record.level()));
                 msg.modifier.color = Some(match record.level() {
-                    log::LogLevel::Debug => Color::Green,
-                    log::LogLevel::Error => Color::Red,
-                    log::LogLevel::Warn => Color::Yellow,
-                    log::LogLevel::Info => Color::Aqua,
-                    log::LogLevel::Trace => Color::Blue,
+                    log::Level::Debug => Color::Green,
+                    log::Level::Error => Color::Red,
+                    log::Level::Warn => Color::Yellow,
+                    log::Level::Info => Color::Aqua,
+                    log::Level::Trace => Color::Blue,
                 });
                 Component::Text(msg)
             },
@@ -337,15 +337,18 @@ impl ConsoleProxy {
 }
 
 impl log::Log for ConsoleProxy {
-    fn enabled(&self, metadata: &log::LogMetadata) -> bool {
-        metadata.level() <= log::LogLevel::Trace
+    fn enabled(&self, metadata: &log::Metadata) -> bool {
+        metadata.level() <= log::Level::Trace
     }
 
-    fn log(&self, record: &log::LogRecord) {
+    fn log(&self, record: &log::Record) {
         if self.enabled(record.metadata()) {
             self.console.lock().unwrap().log(record);
         }
     }
+
+    fn flush(&self) {
+    }
 }
 
 unsafe impl Send for ConsoleProxy {}
diff --git a/src/main.rs b/src/main.rs
index ddffb7e..3812d95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -177,10 +177,8 @@ fn main() {
 
     let proxy = console::ConsoleProxy::new(con.clone());
 
-    log::set_logger(|max_log_level| {
-        max_log_level.set(log::LogLevelFilter::Trace);
-        Box::new(proxy)
-    }).unwrap();
+    log::set_boxed_logger(Box::new(proxy)).unwrap();
+    log::set_max_level(log::LevelFilter::Trace);
 
     info!("Starting steven");