bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Fix some clippy warnings and update dependencies

Browse Source
This commit is contained in:
NG (Graham)
2026-03-21 18:07:03 -04:00
parent 289827ec3b
commit 27da413ed1
4 changed files with 206 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

366
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
rc_core/src/persist/user/team.rs
View File

@@ -91,7 +91,7 @@ impl TeamChooser for TwoTeamPartyAware {
if let Some(platoon_id) = &player.group {
bal_info.platoons.insert(platoon_id.to_owned(), chosen_team);
}
return chosen_team as i32;
chosen_team as i32
} else {
Self::do_cleanup(&mut lock);
let init_info = if let Some(platoon) = &player.group {

7
rc_core/src/persist/user/traits.rs
View File

@@ -428,9 +428,12 @@ pub struct IntercomListener<D: serde::de::DeserializeOwned> {
}
impl <D: serde::de::DeserializeOwned> IntercomListener<D> {
pub async fn listen(self) -> impl futures::Stream<Item=Result<D, reqwest_websocket::Error>> + Unpin {
pub async fn listen(self) -> impl futures::Stream<Item=Result<D, Box<reqwest_websocket::Error>>> + Unpin {
use futures::StreamExt;
self.websocket.map(|msg| msg.and_then(|msg| msg.json()))
self.websocket.map(|msg|
msg.map_err(Box::new)
.and_then(|msg| msg.json().map_err(Box::new))
)
}
}

1
rc_lobby_room/src/lobby.rs
View File

@@ -581,6 +581,7 @@ impl QueueHandler {
}
}
#[allow(clippy::too_many_arguments)]
pub async fn join_queue(&self, map: String, mode: oj_rc_core::data::game_mode::GameMode, visibility: oj_rc_core::data::game_mode::MapVisibility, auto_heal: bool, user: std::sync::Arc<Box<dyn oj_rc_core::persist::user::User<()> + Send + Sync>>, event_emitter: polariton_server::events::EventEmitter, platoon: Option<PlatoonInfo>) {
if !self.is_enabled {
event_emitter.emit(crate::events::enqueue_error::QueueJoinError {