From 5b2a830d2d9095da359c68801810055e757d6dba Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Tue, 15 Jan 2019 12:43:02 -0800
Subject: [PATCH] Remove #[macro_use] from log crate

---
 server/src/bin.rs             | 3 +--
 server/src/commands/build.rs  | 1 +
 server/src/commands/serve.rs  | 1 +
 server/src/commands/upload.rs | 1 +
 server/src/fs_watcher.rs      | 1 +
 server/src/lib.rs             | 3 ---
 server/src/path_map.rs        | 2 ++
 server/src/rbx_session.rs     | 2 +-
 server/src/web.rs             | 1 +
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/src/bin.rs b/server/src/bin.rs
index d57230d2..534d7c6a 100644
--- a/server/src/bin.rs
+++ b/server/src/bin.rs
@@ -1,11 +1,10 @@
-#[macro_use] extern crate log;
-
 use std::{
     path::{Path, PathBuf},
     env,
     process,
 };
 
+use log::error;
 use clap::clap_app;
 
 use librojo::commands;
diff --git a/server/src/commands/build.rs b/server/src/commands/build.rs
index f488fae4..540650ce 100644
--- a/server/src/commands/build.rs
+++ b/server/src/commands/build.rs
@@ -4,6 +4,7 @@ use std::{
     io,
 };
 
+use log::info;
 use failure::Fail;
 
 use crate::{
diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index 3ed97e85..28d456db 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -3,6 +3,7 @@ use std::{
     sync::Arc,
 };
 
+use log::info;
 use failure::Fail;
 
 use crate::{
diff --git a/server/src/commands/upload.rs b/server/src/commands/upload.rs
index 70cdf0cd..950783e3 100644
--- a/server/src/commands/upload.rs
+++ b/server/src/commands/upload.rs
@@ -3,6 +3,7 @@ use std::{
     io,
 };
 
+use log::info;
 use failure::Fail;
 
 use reqwest::header::{ACCEPT, USER_AGENT, CONTENT_TYPE, COOKIE};
diff --git a/server/src/fs_watcher.rs b/server/src/fs_watcher.rs
index 9737aa4e..84741941 100644
--- a/server/src/fs_watcher.rs
+++ b/server/src/fs_watcher.rs
@@ -4,6 +4,7 @@ use std::{
     thread,
 };
 
+use log::info;
 use notify::{
     self,
     DebouncedEvent,
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 6b021803..7fa923cf 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,6 +1,3 @@
-#[macro_use]
-extern crate log;
-
 #[macro_use]
 extern crate serde_derive;
 
diff --git a/server/src/path_map.rs b/server/src/path_map.rs
index a62e2c55..f205d9f4 100644
--- a/server/src/path_map.rs
+++ b/server/src/path_map.rs
@@ -3,6 +3,8 @@ use std::{
     collections::{HashMap, HashSet},
 };
 
+use log::warn;
+
 #[derive(Debug, Serialize)]
 struct PathMapNode<T> {
     value: T,
diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs
index c8266c55..89c71173 100644
--- a/server/src/rbx_session.rs
+++ b/server/src/rbx_session.rs
@@ -7,8 +7,8 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use log::{info, trace};
 use failure::Fail;
-
 use rbx_tree::{RbxTree, RbxInstanceProperties, RbxValue, RbxId};
 
 use crate::{
diff --git a/server/src/web.rs b/server/src/web.rs
index 6700531a..4686950a 100644
--- a/server/src/web.rs
+++ b/server/src/web.rs
@@ -4,6 +4,7 @@ use std::{
     sync::{mpsc, Arc},
 };
 
+use log::trace;
 use rouille::{
     self,
     router,