From 87ede1e2b367a997440626ad9f583600d7cc42fc Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Tue, 15 Nov 2022 15:14:48 -0500
Subject: Fix rust warnings

---
 protocol/src/bridge_engine.rs                 | 2 +-
 server/src/auth.rs                            | 4 +---
 server/src/main.rs                            | 4 ++--
 webapp/src/components/app_context_provider.rs | 6 +++---
 webapp/src/components/game.rs                 | 6 +++---
 webapp/src/components/table.rs                | 6 +++---
 webapp/src/main.rs                            | 7 +------
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/protocol/src/bridge_engine.rs b/protocol/src/bridge_engine.rs
index 808045d..a914efe 100644
--- a/protocol/src/bridge_engine.rs
+++ b/protocol/src/bridge_engine.rs
@@ -1,6 +1,6 @@
 use crate::card::{Card, Deal, Suit};
 use anyhow::{anyhow, bail};
-use log::{debug, error, info};
+use log::{error, info};
 use regex::Regex;
 use std::cmp::Ordering;
 use std::fmt;
diff --git a/server/src/auth.rs b/server/src/auth.rs
index 98a0000..445a0d2 100644
--- a/server/src/auth.rs
+++ b/server/src/auth.rs
@@ -11,7 +11,6 @@ use async_trait::async_trait;
 use axum::{
     extract::FromRequest,
     response::{IntoResponse, Response},
-    Json,
 };
 use chrono::{DateTime, Utc};
 use lru::LruCache;
@@ -23,10 +22,9 @@ use openidconnect::{
     CsrfToken, IssuerUrl, Nonce, OAuth2TokenResponse, RedirectUrl, RefreshToken, Scope,
     TokenResponse,
 };
-use protocol::UserInfo;
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
-use tower_cookies::{Cookie, Cookies};
+use tower_cookies::Cookies;
 use tracing::{debug, error, info};
 use uuid::Uuid;
 
diff --git a/server/src/main.rs b/server/src/main.rs
index 6056dcd..dd7956a 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -81,8 +81,8 @@ async fn main() {
 }
 
 async fn get_table_view(
-    session: AuthenticatedSession,
-    extension: ContextExtension,
+    _session: AuthenticatedSession,
+    _extension: ContextExtension,
     Path(id): Path<Uuid>
 ) -> Result<Json<protocol::TableView>, BridgeError> {
     info!("Getting table state for table {id:}");
diff --git a/webapp/src/components/app_context_provider.rs b/webapp/src/components/app_context_provider.rs
index 0b490fc..bba7e33 100644
--- a/webapp/src/components/app_context_provider.rs
+++ b/webapp/src/components/app_context_provider.rs
@@ -4,7 +4,7 @@ use gloo_net::http::Request;
 use log::info;
 use protocol::UserInfo;
 use uuid::Uuid;
-use std::{future::Future, rc::Rc};
+use std::future::Future;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 use yew_router::prelude::*;
@@ -110,7 +110,7 @@ pub fn use_app_context() -> AppContext {
     let state : AppState = use_context::<AppState>().unwrap();
     let history = use_history().unwrap();
 
-    AppContext { state: state, history }
+    AppContext { state, history }
 }
 
 #[function_component(AppContextProvider)]
@@ -127,7 +127,7 @@ pub fn app_context_provider(props: &Props) -> Html {
                     match initialize_user_info().await {
                         Ok(user_info) => user.set(Some(user_info)),
                         Err(e) => error.set(Some(ErrorInfoProperties {
-                            message: format!("Could not contact server"),
+                            message: format!("Could not contact server: {:?}", e),
                         })),
                     };
                 });
diff --git a/webapp/src/components/game.rs b/webapp/src/components/game.rs
index 7ade948..45ad035 100644
--- a/webapp/src/components/game.rs
+++ b/webapp/src/components/game.rs
@@ -77,7 +77,7 @@ pub fn game() -> Html {
                         contract,
                         bidding,
                     }),
-                    Ok(DealInPlayResult::PlayFinished(tricks)) => todo!(),
+                    Ok(DealInPlayResult::PlayFinished(_tricks)) => todo!(),
                 };
             }
         })
@@ -110,8 +110,8 @@ pub fn game() -> Html {
         }
         GameState::Play {
             playing_deal,
-            contract,
-            bidding,
+            contract: _,
+            bidding: _,
         } => {
             html! {
                 <>
diff --git a/webapp/src/components/table.rs b/webapp/src/components/table.rs
index b8da804..bccbfe4 100644
--- a/webapp/src/components/table.rs
+++ b/webapp/src/components/table.rs
@@ -1,6 +1,5 @@
 use log::info;
 use yew::prelude::*;
-use yew_router::prelude::*;
 
 use crate::use_app_context;
 
@@ -8,9 +7,10 @@ use crate::use_app_context;
 pub fn table(props: &TableProps) -> Html {
     let ctx = use_app_context();
 
-    let table_state: UseStateHandle<Option<protocol::TableView>> = use_state(|| None);
+    // let table_state: UseStateHandle<Option<protocol::TableView>> = use_state(|| None);
     {
-	let table_state = table_state.clone();
+        // TODO update this from server state
+	// let table_state = table_state.clone();
 	let ctx = ctx.clone();
 	ctx.spawn_async(async move {
 	    info!("Getting table state");
diff --git a/webapp/src/main.rs b/webapp/src/main.rs
index 25d12f1..f9a3f01 100644
--- a/webapp/src/main.rs
+++ b/webapp/src/main.rs
@@ -1,16 +1,12 @@
-use std::rc::Rc;
-
 #[allow(unused_imports)]
 use log::{debug, error, info, warn};
 use yew::prelude::*;
 use yew_router::prelude::*;
 pub mod components;
-use components::{AppContext, AppContextProvider, ErrorInfo, Game, Table};
-use gloo_net::http::Request;
+use components::{AppContextProvider, ErrorInfo, Game, Table};
 extern crate wee_alloc;
 pub mod routing;
 use crate::{components::use_app_context, routing::Route};
-use uuid::Uuid;
 
 // Use `wee_alloc` as the global allocator.
 #[global_allocator]
@@ -97,4 +93,3 @@ fn switch(routes: &Route) -> Html {
         </>
     }
 }
-
-- 
cgit v1.2.3