diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2023-01-01 20:47:59 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2023-01-01 20:50:11 -0500 |
commit | 33dfcd18252dd8a4845cd58b93bd177ab0dffde9 (patch) | |
tree | fbb6fc049677a492cd9d5196d6b1709f0b32b873 /webapp/src | |
parent | d3fbefad9cf25786fb5f28f96eeceb65d0a8b35b (diff) |
Fix clippy warnings
Diffstat (limited to 'webapp/src')
-rw-r--r-- | webapp/src/components/app_context_provider.rs | 2 | ||||
-rw-r--r-- | webapp/src/components/bidding.rs | 4 | ||||
-rw-r--r-- | webapp/src/components/card.rs | 2 | ||||
-rw-r--r-- | webapp/src/components/hand.rs | 4 | ||||
-rw-r--r-- | webapp/src/components/table.rs | 8 | ||||
-rw-r--r-- | webapp/src/components/trick_in_play.rs | 2 | ||||
-rw-r--r-- | webapp/src/main.rs | 4 |
7 files changed, 12 insertions, 14 deletions
diff --git a/webapp/src/components/app_context_provider.rs b/webapp/src/components/app_context_provider.rs index 081026c..35b35d7 100644 --- a/webapp/src/components/app_context_provider.rs +++ b/webapp/src/components/app_context_provider.rs @@ -113,7 +113,7 @@ async fn initialize_user_info() -> Result<Option<UserInfo>, anyhow::Error> { .assign("/api/login") .unwrap(); }; - Ok(ok_json(response).await.context("requesting user_info")?) + ok_json(response).await.context("requesting user_info") } pub fn use_app_context() -> AppContext { diff --git a/webapp/src/components/bidding.rs b/webapp/src/components/bidding.rs index cce854b..e5950f6 100644 --- a/webapp/src/components/bidding.rs +++ b/webapp/src/components/bidding.rs @@ -15,7 +15,7 @@ pub fn bidding(props: &BiddingProperties) -> Html { { let bidding = bidding.clone(); - let dealer = props.dealer.clone(); + let dealer = props.dealer; use_effect_with_deps( move |_| { bidding.set(bridge_engine::Bidding::new(dealer)); @@ -45,7 +45,7 @@ pub fn bidding(props: &BiddingProperties) -> Html { <> <p>{ "Bidding box" }</p> <BiddingBox - current_bid={ bidding.highest_bid().clone() } + current_bid={ bidding.highest_bid() } { on_bid } /> <p>{ "Bidding table" }</p> diff --git a/webapp/src/components/card.rs b/webapp/src/components/card.rs index cf42923..6323572 100644 --- a/webapp/src/components/card.rs +++ b/webapp/src/components/card.rs @@ -6,7 +6,7 @@ pub fn ccard(props: &CardProps) -> Html { let card::Card(suit, rank) = props.card; let onclick = { - let card = props.card.clone(); + let card = props.card; let onclick = props.onclick.clone(); Callback::from(move |_| onclick.emit(card)) }; diff --git a/webapp/src/components/hand.rs b/webapp/src/components/hand.rs index d70adfc..6bd8fce 100644 --- a/webapp/src/components/hand.rs +++ b/webapp/src/components/hand.rs @@ -1,5 +1,5 @@ use crate::components::card::Card; -use protocol::{card::{self, sort_cards, RankOrder}, bridge_engine::SUIT_DISPLAY_ORDER}; +use protocol::{card::{sort_cards, RankOrder}, bridge_engine::SUIT_DISPLAY_ORDER}; use yew::prelude::*; use crate::components::HandProps; @@ -10,7 +10,7 @@ pub fn hand(props: &HandProps) -> Html { sort_cards(&SUIT_DISPLAY_ORDER, RankOrder::Descending, &mut cards); let cards = cards.iter().map(|card| { html! { - <Card card={ card.clone() } onclick={ props.on_card_clicked.clone() } /> + <Card card={*card} onclick={ props.on_card_clicked.clone() } /> } }); diff --git a/webapp/src/components/table.rs b/webapp/src/components/table.rs index c1b4b47..9f2cbb3 100644 --- a/webapp/src/components/table.rs +++ b/webapp/src/components/table.rs @@ -82,7 +82,7 @@ impl OnlineTableInner { <div class="sidebar"> <div> <h2>{"Contract"}</h2> - <p>{format!("todo")}</p> + <p>{"todo"}</p> </div> <div> <h2>{"Bidding"}</h2> @@ -90,7 +90,7 @@ impl OnlineTableInner { </div> <div> <h2>{"Trick Count"}</h2> - <p>{format!("todo")}</p> + <p>{"todo"}</p> </div> </div> <div class="center"> @@ -222,7 +222,7 @@ impl Component for OnlineTableInner { fn view(&self, ctx: &yew::Context<Self>) -> Html { match &self.table_state { - None => return loading(), + None => loading(), Some(TableStatePlayerView::Unknown) => html! { <p>{"An error occurred."}</p> }, @@ -250,7 +250,7 @@ pub fn bidding_view( </div> <div class="center"> <BiddingTable bidding={bidding.bidding.clone()} /> - <BiddingBox current_bid={bidding.bidding.highest_bid().clone()} on_bid={ on_bid } /> + <BiddingBox current_bid={bidding.bidding.highest_bid()} on_bid={ on_bid } /> { format!("It is {:?} to bid", bidding.bidding.current_bidder()) } </div> <div class="hand south"> diff --git a/webapp/src/components/trick_in_play.rs b/webapp/src/components/trick_in_play.rs index 883a3c1..e5790a3 100644 --- a/webapp/src/components/trick_in_play.rs +++ b/webapp/src/components/trick_in_play.rs @@ -20,7 +20,7 @@ pub fn trick_in_play(props: &TrickInPlayProps) -> Html { }; html! { <div class={class}> - <Card card={ card.clone() } /> + <Card card={*card} /> </div> } }); diff --git a/webapp/src/main.rs b/webapp/src/main.rs index c907183..1d291ec 100644 --- a/webapp/src/main.rs +++ b/webapp/src/main.rs @@ -1,5 +1,4 @@ -#[allow(unused_imports)] -use log::{debug, error, info, warn}; +#![allow(clippy::let_unit_value)] // This is triggering on yew html! {}. use yew::prelude::*; use yew_router::prelude::*; pub mod components; @@ -50,7 +49,6 @@ fn home() -> Html { } let create_table = { - let ctx = ctx.clone(); Callback::from(move |_| { ctx.create_table(); }) |