From 4d4810b52b6fe2e72a1a910b24a4d783ea0484e3 Mon Sep 17 00:00:00 2001 From: Kate Korsaro Date: Sun, 16 Nov 2025 09:52:44 +0100 Subject: [PATCH] review: change roll result type to i32 --- 01.workspace/oxidice_lib/src/imp/die_roll.rs | 4 ++-- 01.workspace/oxidice_lib/src/imp/handful_roll.rs | 2 +- 01.workspace/oxidice_lib/src/imp/outcome_max.rs | 4 ++-- 01.workspace/oxidice_lib/src/imp/outcome_min.rs | 4 ++-- 01.workspace/oxidice_lib/src/imp/outcome_sum.rs | 4 ++-- 01.workspace/oxidice_lib/src/str/outcome.rs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/01.workspace/oxidice_lib/src/imp/die_roll.rs b/01.workspace/oxidice_lib/src/imp/die_roll.rs index b0f5dab..a79eb83 100644 --- a/01.workspace/oxidice_lib/src/imp/die_roll.rs +++ b/01.workspace/oxidice_lib/src/imp/die_roll.rs @@ -1,8 +1,8 @@ use crate::*; impl Die { - pub fn roll(&self) -> u16 { + pub fn roll(&self) -> i32 { let mut rng = rand::rng(); - rng.random_range(1..=self.sides) as u16 + rng.random_range(1..=self.sides) as i32 } } diff --git a/01.workspace/oxidice_lib/src/imp/handful_roll.rs b/01.workspace/oxidice_lib/src/imp/handful_roll.rs index 5360535..7a4b8b7 100644 --- a/01.workspace/oxidice_lib/src/imp/handful_roll.rs +++ b/01.workspace/oxidice_lib/src/imp/handful_roll.rs @@ -2,7 +2,7 @@ use crate::*; impl Handful { pub fn roll(self) -> Outcome { - let mut die_rolls = Vec::::new(); + let mut die_rolls = Vec::::new(); for die in self.dice { die_rolls.push(die.roll()); } diff --git a/01.workspace/oxidice_lib/src/imp/outcome_max.rs b/01.workspace/oxidice_lib/src/imp/outcome_max.rs index b190574..6847024 100644 --- a/01.workspace/oxidice_lib/src/imp/outcome_max.rs +++ b/01.workspace/oxidice_lib/src/imp/outcome_max.rs @@ -1,10 +1,10 @@ use crate::*; -fn max_of(values: Vec) -> Result { +fn max_of(values: Vec) -> Result { if values.is_empty() { return Err(FailedTo::ProcessInput); } - let ret = Ok(Outcome::Scalar(u16::MIN)); + let ret = Ok(Outcome::Scalar(i32::MIN)); ret.and_then(|_| { values .iter() diff --git a/01.workspace/oxidice_lib/src/imp/outcome_min.rs b/01.workspace/oxidice_lib/src/imp/outcome_min.rs index 415cb5b..5fbbbc4 100644 --- a/01.workspace/oxidice_lib/src/imp/outcome_min.rs +++ b/01.workspace/oxidice_lib/src/imp/outcome_min.rs @@ -1,10 +1,10 @@ use crate::*; -fn min_of(values: Vec) -> Result { +fn min_of(values: Vec) -> Result { if values.is_empty() { return Err(FailedTo::ProcessInput); } - Ok(Outcome::Scalar(u16::MIN)).and_then(|_| { + Ok(Outcome::Scalar(i32::MIN)).and_then(|_| { values .iter() .min() diff --git a/01.workspace/oxidice_lib/src/imp/outcome_sum.rs b/01.workspace/oxidice_lib/src/imp/outcome_sum.rs index 099f7e9..785a22d 100644 --- a/01.workspace/oxidice_lib/src/imp/outcome_sum.rs +++ b/01.workspace/oxidice_lib/src/imp/outcome_sum.rs @@ -1,6 +1,6 @@ use crate::*; -fn sum_of(values: Vec) -> Result { +fn sum_of(values: Vec) -> Result { if values.is_empty() { return Ok(Outcome::Scalar(0)); } @@ -10,7 +10,7 @@ fn sum_of(values: Vec) -> Result { Outcome::List(_) => Err(FailedTo::ProcessInput), Outcome::Scalar(acc) => acc .checked_add(value) - .map(|new_acc: u16| Outcome::Scalar(new_acc)) + .map(|new_acc: i32| Outcome::Scalar(new_acc)) .ok_or(FailedTo::SumValues), }) } diff --git a/01.workspace/oxidice_lib/src/str/outcome.rs b/01.workspace/oxidice_lib/src/str/outcome.rs index 29e7bb3..ebe39ed 100644 --- a/01.workspace/oxidice_lib/src/str/outcome.rs +++ b/01.workspace/oxidice_lib/src/str/outcome.rs @@ -4,8 +4,8 @@ use std::fmt::Display; #[derive(Debug, PartialEq, PartialOrd, Eq, Ord, Clone, Hash)] pub enum E { - Scalar(u16), - List(Vec), + Scalar(i32), + List(Vec), } impl Display for E {