From a390bbfb0d8ffb08ed8150decfc4e6d82221a47e Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Fri, 22 Jan 2021 09:24:20 +0100
Subject: [PATCH] Update log and env_logger crates.

---
 Cargo.lock  | 98 ++++++++++++++++++++++++++++++-----------------------
 Cargo.toml  |  4 +--
 src/main.rs |  8 +----
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48e2947..ebab0b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,11 +2,11 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.5.3"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
- "memchr 0.1.11",
+ "memchr",
 ]
 
 [[package]]
@@ -30,6 +30,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -251,12 +262,15 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.3.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
+checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
 dependencies = [
- "log 0.3.9",
+ "atty",
+ "humantime",
+ "log 0.4.8",
  "regex",
+ "termcolor",
 ]
 
 [[package]]
@@ -380,7 +394,7 @@ dependencies = [
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr 2.3.4",
+ "memchr",
  "pin-project-lite",
  "pin-utils",
  "proc-macro-hack",
@@ -409,6 +423,12 @@ version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -517,15 +537,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
-[[package]]
-name = "memchr"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memchr"
 version = "2.3.4"
@@ -953,22 +964,21 @@ checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 
 [[package]]
 name = "regex"
-version = "0.1.80"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
  "aho-corasick",
- "memchr 0.1.11",
+ "memchr",
  "regex-syntax",
  "thread_local",
- "utf8-ranges",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.3.9"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
 
 [[package]]
 name = "rust-crypto"
@@ -1099,7 +1109,7 @@ dependencies = [
  "encoding_rs",
  "env_logger",
  "futures 0.3.8",
- "log 0.3.9",
+ "log 0.4.8",
  "mio 0.6.22",
  "parking_lot 0.8.0",
  "rust-crypto",
@@ -1125,6 +1135,15 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.19"
@@ -1145,23 +1164,13 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "thread-id"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-dependencies = [
- "kernel32-sys",
- "libc",
-]
-
 [[package]]
 name = "thread_local"
-version = "0.2.7"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
+checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
 dependencies = [
- "thread-id",
+ "lazy_static",
 ]
 
 [[package]]
@@ -1216,7 +1225,7 @@ dependencies = [
  "autocfg 1.0.0",
  "bytes 1.0.0",
  "libc",
- "memchr 2.3.4",
+ "memchr",
  "mio 0.7.7",
  "num_cpus",
  "once_cell",
@@ -1450,12 +1459,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -1484,6 +1487,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
diff --git a/Cargo.toml b/Cargo.toml
index 2d54877..c599e00 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,9 @@ bytes = "^1.0"
 crossbeam-channel = "^0.3"
 encoding = "^0.2"
 encoding_rs = "^0.8"
-env_logger = "^0.3.2"
+env_logger = "^0.8"
 futures = "^0.3"
-log = "^0.3.5"
+log = "^0.4"
 mio = "^0.6"
 parking_lot = "^0.8"
 rust-crypto = "^0.2.34"
diff --git a/src/main.rs b/src/main.rs
index 6ecf2d9..856d95e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,13 +21,7 @@ mod room;
 mod user;
 
 fn main() {
-  match env_logger::init() {
-    Ok(()) => (),
-    Err(err) => {
-      error!("Error initializing logger: {}", err);
-      return;
-    }
-  };
+  env_logger::init();
 
   let (proto_to_client_tx, proto_to_client_rx) = crossbeam_channel::unbounded();