From 9a1bee0eba270b6e0dd08addbfd1c36f0612bea1 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 29 Sep 2020 00:01:14 +0100
Subject: [PATCH] remove slog macro_use

---
 Cargo.lock        | 12 ++++++++++++
 Cargo.toml        |  5 +++--
 src/main.rs       |  3 +--
 src/server/mod.rs |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91d24ef..5ea3768 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -243,6 +243,17 @@ dependencies = [
  "lazy_static 1.4.0",
 ]
 
+[[package]]
+name = "derive_more"
+version = "0.99.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -1247,6 +1258,7 @@ version = "0.1.0"
 dependencies = [
  "badge",
  "cadence",
+ "derive_more",
  "failure",
  "futures",
  "hyper 0.11.27",
diff --git a/Cargo.toml b/Cargo.toml
index c6622a6..38b140c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
 badge = { path = "./libs/badge" }
 
 cadence = "0.13"
+derive_more = "0.99"
 failure = "0.1"
 futures = "0.1"
 hyper = "0.11"
@@ -27,8 +28,8 @@ route-recognizer = "0.1"
 rustsec = "0.6.0"
 semver = { version = "0.11", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.9"
-shared_failure = "0.1.0"
+serde_json = "1"
+shared_failure = "0.1"
 slog = "2"
 slog-json = "2"
 tokio-core = "0.1"
diff --git a/src/main.rs b/src/main.rs
index de77c47..29959be 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,8 +3,6 @@
 #[macro_use]
 extern crate failure;
 #[macro_use]
-extern crate slog;
-#[macro_use]
 extern crate try_future;
 
 use std::env;
@@ -17,6 +15,7 @@ use hyper::server::Http;
 use hyper::Client;
 use hyper_tls::HttpsConnector;
 use slog::Drain;
+use slog::{info, o};
 use tokio_core::reactor::Core;
 
 mod engine;
diff --git a/src/server/mod.rs b/src/server/mod.rs
index f9b9f65..0326c05 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -8,6 +8,7 @@ use once_cell::sync::Lazy;
 use route_recognizer::{Params, Router};
 use semver::VersionReq;
 use slog::Logger;
+use slog::{error, o};
 use tokio_service::Service;
 
 mod assets;