Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hylo-fix"
version = "0.5.1"
version = "0.5.2"
edition = "2021"
description = "Fixed-point number types with Solana Anchor support"
authors = ["0xPlish <plish@hylo.so>", "Curtis McEnroe <programble@gmail.com>"]
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/25.11";
rust-overlay.url = "github:oxalica/rust-overlay/bc00300f010275e46feb3c3974df6587ff7b7808";
rust-overlay.url = "github:oxalica/rust-overlay/2859683cd9ef7858d324c5399b0d8d6652bf4044";
flake-parts.url = "github:hercules-ci/flake-parts";
};

Expand All @@ -25,7 +25,7 @@
buildInputs = [
openssl
pkg-config
(rust-bin.stable."1.86.0".default.override {
(rust-bin.stable."1.88.0".default.override {
extensions = [ "rust-analyzer" "rust-src" ];
})
];
Expand Down
35 changes: 35 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -925,4 +925,39 @@ mod tests {
assert_eq!(Micro::<u64>::one().bits, 1_000_000);
assert_eq!(Nano::<u64>::one().bits, 1_000_000_000);
}

#[test]
fn checked_convert_upconvert() {
assert_eq!(
Milli::new(5u64).checked_convert(),
Some(Micro::new(5_000u64)),
);
}

#[test]
fn checked_convert_downconvert() {
assert_eq!(
Micro::new(5_000u64).checked_convert(),
Some(Milli::new(5u64)),
);
}

#[test]
fn checked_convert_identity() {
assert_eq!(Milli::new(42u64).checked_convert(), Some(Milli::new(42u64)),);
}

#[test]
fn checked_convert_overflow() {
assert_eq!(Milli::new(u64::MAX).checked_convert::<typenum::N9>(), None,);
}

#[test]
fn checked_convert_matches_convert() {
let value = Milli::new(15u64);
assert_eq!(
value.checked_convert::<typenum::N6>(),
Some(value.convert::<typenum::N6>()),
);
}
}
24 changes: 24 additions & 0 deletions src/util.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use crate::muldiv::MulDiv;
use crate::typenum::consts::Z0;
use crate::typenum::{Integer, IsLess, B1, U10};
use crate::{Fix, FromUnsigned, Pow};
Expand All @@ -18,3 +19,26 @@ where
Fix::new(base.pow(Exp::to_i32().unsigned_abs()))
}
}

impl<Bits, Exp> Fix<Bits, U10, Exp>
where
Self: FixExt,
Bits: MulDiv<Output = Bits>,
{
/// Converts to another _Exp_, returning `None` on overflow.
///
/// ```
/// use fix::prelude::*;
/// let source = UFix64::<N3>::new(5u64);
/// let target = source.checked_convert::<N6>();
/// assert_eq!(target, Some(UFix64::<N6>::new(5_000u64)));
/// ```
pub fn checked_convert<ToExp>(self) -> Option<Fix<Bits, U10, ToExp>>
where
Fix<Bits, U10, ToExp>: FixExt,
{
let target_one = Fix::<Bits, U10, ToExp>::one();
let source_one = Self::one();
target_one.mul_div_floor(self, source_one)
}
}