From c298566fd010f40b98ecf9c479551ea79b384e7b Mon Sep 17 00:00:00 2001
From: David Blajda <blajda@hotmail.com>
Date: Wed, 8 May 2019 16:48:44 +0000
Subject: Remove unused imports and add ratelimit trace

---
 twitch_api/src/bin/main.rs                | 6 +++---
 twitch_api/src/client.rs                  | 3 ++-
 twitch_api/src/helix/namespaces/clips.rs  | 1 -
 twitch_api/src/helix/namespaces/users.rs  | 1 -
 twitch_api/src/kraken/namespaces/clips.rs | 1 -
 twitch_api/src/kraken/namespaces/users.rs | 1 -
 twitch_api/src/namespace/auth.rs          | 1 -
 twitch_api/src/sync/barrier.rs            | 2 +-
 8 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/twitch_api/src/bin/main.rs b/twitch_api/src/bin/main.rs
index a545ec1..59db38d 100644
--- a/twitch_api/src/bin/main.rs
+++ b/twitch_api/src/bin/main.rs
@@ -19,13 +19,13 @@ fn main() {
 
     let config = ClientConfig {
         max_retrys: 0,
-        ratelimits: RatelimitMap::empty(),
+        ratelimits: RatelimitMap::default(),
         ..ClientConfig::default()
     };
 
     let client_id = &env::var("TWITCH_API").unwrap();
     let helix_client =  HelixClient::new_with_config(client_id, config);
-    let kraken_client = KrakenClient::new(client_id);
+    let _kraken_client = KrakenClient::new(client_id);
 
         /*
         .authenticate(&env::var("TWITCH_SECRET").unwrap())
@@ -80,7 +80,7 @@ fn main() {
 
 
     let f = futures::future::ok(1).and_then(move |_| {
-        for i in 0..80 {
+        for _i in 0..80 {
             let u = helix_client
                 .users()
                 .users(&vec!(), &vec!("freakey"))
diff --git a/twitch_api/src/client.rs b/twitch_api/src/client.rs
index 1fe57e5..c51abb5 100644
--- a/twitch_api/src/client.rs
+++ b/twitch_api/src/client.rs
@@ -280,7 +280,7 @@ impl Default for RatelimitMap {
 
     fn default() -> Self {
         let mut limits = HashMap::new();
-        limits.insert(RatelimitKey::Default, Ratelimit::new(30, "Ratelimit-Limit", "Ratelimit-Remaining", "Ratelimit-Reset"));
+        limits.insert(RatelimitKey::Default, Ratelimit::new(30, "ratelimit-limit", "ratelimit-remaining", "ratelimit-reset"));
         RatelimitMap {
             inner: limits
         }
@@ -1109,6 +1109,7 @@ impl<T: DeserializeOwned + 'static + Send> Future for ApiRequest<T> {
                     if let Some(limits) = limits {
                         let mut mut_limits = limits.inner.lock().unwrap();
                         mut_limits.inflight = mut_limits.inflight + 1;
+                        trace!("[TWITCH_API] (limit, remaining, inflight) ({:?}, {:?}, {:?})", mut_limits.limit, mut_limits.remaining, mut_limits.inflight);
                     }
 
                     let mut builder = reqwest.request(self.inner.method.clone(), &self.inner.url);
diff --git a/twitch_api/src/helix/namespaces/clips.rs b/twitch_api/src/helix/namespaces/clips.rs
index c4595ce..558d374 100644
--- a/twitch_api/src/helix/namespaces/clips.rs
+++ b/twitch_api/src/helix/namespaces/clips.rs
@@ -6,7 +6,6 @@ type ClipsNamespace = Namespace<Clips>;
 
 impl ClipsNamespace {
     pub fn clip<S: ToString>(self, id: &S) -> ApiRequest<DataContainer<Clip>> {
-        use self::clip;
         clip(self.client, id)
     }
 }
diff --git a/twitch_api/src/helix/namespaces/users.rs b/twitch_api/src/helix/namespaces/users.rs
index 2e922d6..1bbec4a 100644
--- a/twitch_api/src/helix/namespaces/users.rs
+++ b/twitch_api/src/helix/namespaces/users.rs
@@ -7,7 +7,6 @@ type UsersNamespace = Namespace<Users>;
 
 impl UsersNamespace {
     pub fn users<S: ToString>(self, ids: &[S], logins: &[S]) -> ApiRequest<DataContainer<User>> {
-        use self::users;
         users(self.client, ids, logins)
     }
 }
diff --git a/twitch_api/src/kraken/namespaces/clips.rs b/twitch_api/src/kraken/namespaces/clips.rs
index edde25b..f59d76c 100644
--- a/twitch_api/src/kraken/namespaces/clips.rs
+++ b/twitch_api/src/kraken/namespaces/clips.rs
@@ -10,7 +10,6 @@ type ClipsNamespace = Namespace<Clips>;
 
 impl ClipsNamespace {
     pub fn clip(self, id: &str) -> ApiRequest<Clip> {
-        use self::clip;
         clip(self.client, id)
     }
 }
diff --git a/twitch_api/src/kraken/namespaces/users.rs b/twitch_api/src/kraken/namespaces/users.rs
index d4adb8e..1d5e4cb 100644
--- a/twitch_api/src/kraken/namespaces/users.rs
+++ b/twitch_api/src/kraken/namespaces/users.rs
@@ -10,7 +10,6 @@ type UsersNamespace = Namespace<Users>;
 
 impl UsersNamespace {
     pub fn by_id(self, id: &str) -> ApiRequest<User> {
-        use self::by_id;
         by_id(self.client, id)
     }
 }
diff --git a/twitch_api/src/namespace/auth.rs b/twitch_api/src/namespace/auth.rs
index ff835bf..0dda766 100644
--- a/twitch_api/src/namespace/auth.rs
+++ b/twitch_api/src/namespace/auth.rs
@@ -25,7 +25,6 @@ type AuthNamespace = Namespace<Auth>;
 impl AuthNamespace {
     pub fn client_credentials(self, secret: &str) 
         -> ApiRequest<Credentials> {
-            use self::client_credentials;
             client_credentials(self.client, &secret.to_owned())
         }
 }
diff --git a/twitch_api/src/sync/barrier.rs b/twitch_api/src/sync/barrier.rs
index c0f21b8..c60dd2d 100644
--- a/twitch_api/src/sync/barrier.rs
+++ b/twitch_api/src/sync/barrier.rs
@@ -1,7 +1,7 @@
 use super::waiter::Waiter;
 use futures::prelude::*;
 use std::sync::{Arc, Mutex};
-use futures::future::{Shared, SharedError};
+use futures::future::Shared;
 
 use crate::error::ConditionError;
 
-- 
cgit v1.2.3