milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Add a few impls to the result macro 

Add a few missing impls to the `impl_op_for_references` macro.

Includes a minor whitespace change so that traits are grouped together.
This commit is contained in:
Andrew Poelstra 2025-02-25 20:45:56 +00:00
parent 353c23fa01
commit a44a9d31f6
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
units/src/amount/result.rs
View File

@ -129,7 +129,6 @@ crate::internal_macros::impl_op_for_references! {
fn add(self, rhs: Amount) -> Self::Output { self.checked_add(rhs).valid_or_error() } fn add(self, rhs: Amount) -> Self::Output { self.checked_add(rhs).valid_or_error() }
} }
impl ops::Add<NumOpResult<Amount>> for Amount { impl ops::Add<NumOpResult<Amount>> for Amount {
type Output = NumOpResult<Amount>; type Output = NumOpResult<Amount>;
@ -141,7 +140,6 @@ crate::internal_macros::impl_op_for_references! {
fn sub(self, rhs: Amount) -> Self::Output { self.checked_sub(rhs).valid_or_error() } fn sub(self, rhs: Amount) -> Self::Output { self.checked_sub(rhs).valid_or_error() }
} }
impl ops::Sub<NumOpResult<Amount>> for Amount { impl ops::Sub<NumOpResult<Amount>> for Amount {
type Output = NumOpResult<Amount>; type Output = NumOpResult<Amount>;
@ -158,23 +156,39 @@ crate::internal_macros::impl_op_for_references! {
fn mul(self, rhs: u64) -> Self::Output { self.checked_mul(rhs).valid_or_error() } fn mul(self, rhs: u64) -> Self::Output { self.checked_mul(rhs).valid_or_error() }
} }
impl ops::Mul<u64> for NumOpResult<Amount> {
type Output = NumOpResult<Amount>;
fn mul(self, rhs: u64) -> Self::Output { self.and_then(|lhs| lhs * rhs) }
}
impl ops::Div<u64> for Amount { impl ops::Div<u64> for Amount {
type Output = NumOpResult<Amount>; type Output = NumOpResult<Amount>;
fn div(self, rhs: u64) -> Self::Output { self.checked_div(rhs).valid_or_error() } fn div(self, rhs: u64) -> Self::Output { self.checked_div(rhs).valid_or_error() }
} }
impl ops::Div<u64> for NumOpResult<Amount> {
type Output = NumOpResult<Amount>;
fn div(self, rhs: u64) -> Self::Output { self.and_then(|lhs| lhs / rhs) }
}
impl ops::Rem<u64> for Amount { impl ops::Rem<u64> for Amount {
type Output = NumOpResult<Amount>; type Output = NumOpResult<Amount>;
fn rem(self, modulus: u64) -> Self::Output { self.checked_rem(modulus).valid_or_error() } fn rem(self, modulus: u64) -> Self::Output { self.checked_rem(modulus).valid_or_error() }
} }
impl ops::Rem<u64> for NumOpResult<Amount> {
type Output = NumOpResult<Amount>;
fn rem(self, modulus: u64) -> Self::Output { self.and_then(|lhs| lhs % modulus) }
}
impl ops::Add<SignedAmount> for SignedAmount { impl ops::Add<SignedAmount> for SignedAmount {
type Output = NumOpResult<SignedAmount>; type Output = NumOpResult<SignedAmount>;
fn add(self, rhs: SignedAmount) -> Self::Output { self.checked_add(rhs).valid_or_error() } fn add(self, rhs: SignedAmount) -> Self::Output { self.checked_add(rhs).valid_or_error() }
} }
impl ops::Add<NumOpResult<SignedAmount>> for SignedAmount { impl ops::Add<NumOpResult<SignedAmount>> for SignedAmount {
type Output = NumOpResult<SignedAmount>; type Output = NumOpResult<SignedAmount>;
@ -202,16 +216,33 @@ crate::internal_macros::impl_op_for_references! {
fn mul(self, rhs: i64) -> Self::Output { self.checked_mul(rhs).valid_or_error() } fn mul(self, rhs: i64) -> Self::Output { self.checked_mul(rhs).valid_or_error() }
} }
impl ops::Mul<i64> for NumOpResult<SignedAmount> {
type Output = NumOpResult<SignedAmount>;
fn mul(self, rhs: i64) -> Self::Output { self.and_then(|lhs| lhs * rhs) }
}
impl ops::Div<i64> for SignedAmount { impl ops::Div<i64> for SignedAmount {
type Output = NumOpResult<SignedAmount>; type Output = NumOpResult<SignedAmount>;
fn div(self, rhs: i64) -> Self::Output { self.checked_div(rhs).valid_or_error() } fn div(self, rhs: i64) -> Self::Output { self.checked_div(rhs).valid_or_error() }
} }
impl ops::Div<i64> for NumOpResult<SignedAmount> {
type Output = NumOpResult<SignedAmount>;
fn div(self, rhs: i64) -> Self::Output { self.and_then(|lhs| lhs / rhs) }
}
impl ops::Rem<i64> for SignedAmount { impl ops::Rem<i64> for SignedAmount {
type Output = NumOpResult<SignedAmount>; type Output = NumOpResult<SignedAmount>;
fn rem(self, modulus: i64) -> Self::Output { self.checked_rem(modulus).valid_or_error() } fn rem(self, modulus: i64) -> Self::Output { self.checked_rem(modulus).valid_or_error() }
} }
impl ops::Rem<i64> for NumOpResult<SignedAmount> {
type Output = NumOpResult<SignedAmount>;
fn rem(self, modulus: i64) -> Self::Output { self.and_then(|lhs| lhs % modulus) }
}
impl<T> ops::Add<NumOpResult<T>> for NumOpResult<T> impl<T> ops::Add<NumOpResult<T>> for NumOpResult<T>
where where