Skip to content

Commit dfe36ac

Browse files
committed
Throw error in path deserialize Option<T> if its None
1 parent 536358f commit dfe36ac

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

crates/control/src/behavior/node.rs

+1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ impl Behavior {
259259
.filter_map(|(player_number, penalty)| {
260260
penalty.is_none().then_some(player_number)
261261
})
262+
// Skip the lowest non-penalized player number since this is always the Keeper or ReplacementKeeper
262263
.skip(1)
263264
.take(2);
264265
if first_two_nonpenalized_nonkeeper_player_numbers

crates/path_serde/src/implementation.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ where
103103

104104
impl<T> PathDeserialize for Option<T>
105105
where
106-
T: PathDeserialize + Default,
106+
T: PathDeserialize,
107107
{
108108
fn deserialize_path<'de, D>(
109109
&mut self,
@@ -115,12 +115,9 @@ where
115115
{
116116
match self {
117117
Some(some) => some.deserialize_path(path, deserializer),
118-
None => {
119-
let mut value = T::default();
120-
value.deserialize_path(path, deserializer)?;
121-
*self = Some(value);
122-
Ok(())
123-
}
118+
None => Err(deserialize::Error::PathDoesNotExist {
119+
path: path.to_string(),
120+
}),
124121
}
125122
}
126123
}

crates/spl_network_messages/src/game_controller_state_message.rs

-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ impl GameState {
315315
Clone,
316316
Copy,
317317
Debug,
318-
Default,
319318
Deserialize,
320319
Eq,
321320
PartialEq,
@@ -326,7 +325,6 @@ impl GameState {
326325
)]
327326
pub enum Team {
328327
Hulks,
329-
#[default]
330328
Opponent,
331329
}
332330

0 commit comments

Comments
 (0)