diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-11-24 17:18:01 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-11-24 17:18:11 +0100 |
| commit | 696dbdd2238e919bffa756fff1f02ace90a81ecb (patch) | |
| tree | 305e03ce4fea3c3ee151c7560414b0e2625264ba /server/src | |
| parent | 95d14ada0c98fb8f2285fd0003000b5a517f9267 (diff) | |
| download | hurrycurry-696dbdd2238e919bffa756fff1f02ace90a81ecb.tar hurrycurry-696dbdd2238e919bffa756fff1f02ace90a81ecb.tar.bz2 hurrycurry-696dbdd2238e919bffa756fff1f02ace90a81ecb.tar.zst | |
Manual clippy
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/commands.rs | 15 | ||||
| -rw-r--r-- | server/src/entity/campaign.rs | 2 | ||||
| -rw-r--r-- | server/src/entity/tutorial.rs | 2 | ||||
| -rw-r--r-- | server/src/message.rs | 6 | ||||
| -rw-r--r-- | server/src/network/register.rs | 2 | ||||
| -rw-r--r-- | server/src/server.rs | 2 |
6 files changed, 13 insertions, 16 deletions
diff --git a/server/src/commands.rs b/server/src/commands.rs index 86a3de15..24752cc5 100644 --- a/server/src/commands.rs +++ b/server/src/commands.rs @@ -332,15 +332,10 @@ impl Server { .get_item_by_name(&item) .ok_or(tre!("s.error.item_not_found", s = item))?; #[cfg(not(test))] // TODO rust-analyser does not undestand trait upcasting - if self - .entities - .iter() - .find(|e| { - <dyn std::any::Any>::downcast_ref::<Tutorial>(e.as_ref()) - .map_or(false, |t| t.player == player) - }) - .is_some() - { + if self.entities.iter().any(|e| { + <dyn std::any::Any>::downcast_ref::<Tutorial>(e.as_ref()) + .map_or(false, |t| t.player == player) + }) { return Err(tre!("s.error.tutorial_already_running")); } self.entities.push(Box::new(Tutorial::new(player, item))); @@ -365,7 +360,7 @@ impl Server { player, message: Some(Message::Translation { id: message_id, - params: arguments.into_iter().map(|c| Message::Text(c)).collect(), + params: arguments.into_iter().map(Message::Text).collect(), }), timeout: None, }); diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs index 6683716d..39926a12 100644 --- a/server/src/entity/campaign.rs +++ b/server/src/entity/campaign.rs @@ -117,6 +117,8 @@ impl GateCondition { .reduce(|a, b| trm!("s.campaign.list_helper", m = a, m = b)) .unwrap_or(Message::Text(String::new())), GateCondition::Stars(map, thres) => { + // TODO show current score + let _ = scoreboard; trm!( "s.campaign.condition.stars", s = thres.to_string(), diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index 1d28f13e..60b32c79 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -138,7 +138,7 @@ struct StepContext<'a> { player: PlayerID, } -impl<'a> StepContext<'a> { +impl StepContext<'_> { fn is_hand_item(&self, item: ItemIndex) -> bool { self.ent .game diff --git a/server/src/message.rs b/server/src/message.rs index 79c004a2..069c2b0b 100644 --- a/server/src/message.rs +++ b/server/src/message.rs @@ -25,7 +25,7 @@ macro_rules! trm { ($id:literal $(, $typ:ident = $param:expr)*) => { hurrycurry_protocol::Message::Translation { id: $id.to_owned(), - params: vec![$(crate::trm_param!($typ, $param)),*] + params: vec![$($crate::trm_param!($typ, $param)),*] } }; } @@ -76,9 +76,9 @@ impl Debug for TrError { #[macro_export] macro_rules! tre { ($id:literal $(, $typ:ident = $param:expr)*) => { - crate::message::TrError::Tr { + $crate::message::TrError::Tr { id: $id, - params: vec![$(crate::tre_param!($typ, $param)),*] + params: vec![$($crate::tre_param!($typ, $param)),*] } }; } diff --git a/server/src/network/register.rs b/server/src/network/register.rs index 2bd4fa92..eccdf22b 100644 --- a/server/src/network/register.rs +++ b/server/src/network/register.rs @@ -29,7 +29,7 @@ use std::{ }; use tokio::{sync::RwLock, time::interval}; -const REGISTRY_URI: &'static str = "https://hurrycurry-registry.metamuffin.org"; +const REGISTRY_URI: &str = "https://hurrycurry-registry.metamuffin.org"; pub struct Register { name: String, diff --git a/server/src/server.rs b/server/src/server.rs index d3e9ab59..b9cafede 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -568,7 +568,7 @@ impl Server { if let Some((_, t)) = &player.communicate_persist { timeout.initial = t.initial; }; - player.communicate_persist = message.clone().map(|m| (m, timeout.clone())); + player.communicate_persist = message.clone().map(|m| (m, timeout)); Some(timeout) } else { None |