Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove overflow panics #19

Merged
merged 1 commit into from
Sep 18, 2023
Merged

feat: remove overflow panics #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ pub enum DError {
ParseError(String),
#[error("`{0}`")]
NormalError(String),
#[error("overflow error")]
OverflowError,
}

#[derive(Debug, Eq, PartialEq)]
Expand Down Expand Up @@ -242,7 +244,7 @@ impl TimeUnit {
TimeUnit::MicroSecond => ONE_MICROSECOND_NANOSECOND,
TimeUnit::NanoSecond => 1,
};
Ok(time * unit)
time.checked_mul(unit).ok_or(DError::OverflowError)
}
}

Expand All @@ -269,15 +271,16 @@ impl CondUnit {

fn calc(&self, x: u64, y: u64) -> DResult<Duration> {
let nano_second = match self {
CondUnit::Plus => x + y,
CondUnit::Plus => x.checked_add(y).ok_or(DError::OverflowError)?,
CondUnit::Star => {
let x: Decimal = x.into();
let y: Decimal = y.into();
let ret =
(x / one_second_decimal()) * (y / one_second_decimal()) * one_second_decimal();
ret.to_u64().ok_or_else(|| {
DError::ParseError(format!("type of Decimal:{} convert to u64 error", ret))
})?
let ret = (x / one_second_decimal())
.checked_mul(y / one_second_decimal())
.ok_or(DError::OverflowError)?
.checked_mul(one_second_decimal())
.ok_or(DError::OverflowError)?;
ret.to_u64().ok_or(DError::OverflowError)?
}
};
Ok(Duration::from_nanos(nano_second))
Expand All @@ -303,15 +306,17 @@ impl Calc<(CondUnit, u64)> for Vec<(&str, CondUnit, TimeUnit)> {
)));
}
match init_cond {
CondUnit::Plus => init_duration += time_unit.duration(val)?,
CondUnit::Plus => {
init_duration = init_duration
.checked_add(time_unit.duration(val)?)
.ok_or(DError::OverflowError)?;
}
CondUnit::Star => {
let time: Decimal = time_unit.duration(val)?.into();
let i = time / one_second_decimal();
let mut init: Decimal = init_duration.into();
init *= i;
init_duration = init.to_u64().ok_or_else(|| {
DError::ParseError(format!("type of Decimal:{} convert to u64 error", init))
})?;
init = init.checked_mul(i).ok_or(DError::OverflowError)?;
init_duration = init.to_u64().ok_or(DError::OverflowError)?;
}
}
}
Expand Down