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

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))
)
}
}