From bb73e71da25959dbc3b722c9f34f5be631c6f5db Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Mon, 1 Nov 2021 21:52:51 +0100
Subject: [PATCH] Remove macro_use for log crate.

---
 client/src/client.rs                             | 1 +
 client/src/control/ws.rs                         | 1 +
 client/src/dispatcher.rs                         | 2 +-
 client/src/handlers/room_join_request_handler.rs | 1 +
 client/src/main.rs                               | 6 +-----
 client/src/room.rs                               | 1 +
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/client.rs b/client/src/client.rs
index 1f28cba..1f2640b 100644
--- a/client/src/client.rs
+++ b/client/src/client.rs
@@ -1,6 +1,7 @@
 use std::net;
 
 use crossbeam_channel;
+use log::{error, info, warn};
 use slab;
 use solstice_proto;
 use solstice_proto::peer;
diff --git a/client/src/control/ws.rs b/client/src/control/ws.rs
index 4e884f5..ab1eb25 100644
--- a/client/src/control/ws.rs
+++ b/client/src/control/ws.rs
@@ -3,6 +3,7 @@ use std::net::SocketAddr;
 use anyhow::Context;
 use futures::stream::{SplitSink, SplitStream};
 use futures::{SinkExt, StreamExt};
+use log::{debug, error, info, warn};
 use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::mpsc;
 use tokio_tungstenite::tungstenite::{
diff --git a/client/src/dispatcher.rs b/client/src/dispatcher.rs
index 4ab6494..b38a014 100644
--- a/client/src/dispatcher.rs
+++ b/client/src/dispatcher.rs
@@ -2,7 +2,7 @@
 
 use std::fmt::Debug;
 
-use log::warn;
+use log::{error, warn};
 use solstice_proto::server::ServerResponse;
 
 use crate::context::Context;
diff --git a/client/src/handlers/room_join_request_handler.rs b/client/src/handlers/room_join_request_handler.rs
index 9c2a020..a8888dc 100644
--- a/client/src/handlers/room_join_request_handler.rs
+++ b/client/src/handlers/room_join_request_handler.rs
@@ -1,4 +1,5 @@
 use anyhow::Context as AnyhowContext;
+use log::error;
 use solstice_proto::server::RoomJoinRequest;
 use solstice_proto::ServerRequest;
 
diff --git a/client/src/main.rs b/client/src/main.rs
index d00d2f6..efb823d 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -1,12 +1,8 @@
-// Still no 2018 way of using the log crate without `use log::*` everywhere.
-#[macro_use]
-extern crate log;
-
 use anyhow::Context;
 use clap::{App, Arg};
 use crossbeam_channel;
 use env_logger;
-use log::info;
+use log::{error, info};
 use tokio::net::TcpStream;
 use tokio::sync::mpsc;
 
diff --git a/client/src/room.rs b/client/src/room.rs
index 1f5978a..afa395e 100644
--- a/client/src/room.rs
+++ b/client/src/room.rs
@@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::mem;
 use std::time::SystemTime;
 
+use log::{error, info, warn};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use solstice_proto::{server, User};
 use thiserror::Error;