From: Lymia Aluysia Date: Sat, 4 Apr 2020 19:45:37 +0000 (-0700) Subject: Rename from_u128/to_u128 series slightly. X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4f399e51f25bbd0d6ee65e4327953813962ba604;p=enumset.git Rename from_u128/to_u128 series slightly. --- diff --git a/RELEASES.md b/RELEASES.md index 746e66c..25201a8 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,13 +1,24 @@ # Version 1.0.0 (2020-04-01) - Unreleased + +## Breaking Changes * **[WARNING: Potential silent breaking change]** Changed `EnumSet::insert` to return whether a value was newly inserted, rather than whether the value already existed in the set. This corresponds better with the behavior of `HashSet::insert` and `BTreeSet::insert`. -* Renamed `to_bits`/`from_bits` to `to_u128`/`from_u128` and added additional - methods for other built-in numeric types. +* Renamed `to_bits`/`from_bits` to `as_u128`/`from_u128`. * `EnumSet::bit_width` and `EnumSet::variant_count` now return a `u32` instead of a `u8` for future-proofing. * Removed `nightly` feature flag, as it is no longer required. + +## New features +* Added a series of functions like `as_u128`/`from_u128` for other unsigned + numeric types. (e.g. `as_u8`/`from_u8`, `as_u16`/`from_u16`, etc) +* Added variants of `as_u128`/`from_u128` that return an `Option` instead of + panicking when the conversion cannot be done. +* Added variants of `as_u128`/`from_u128` that truncate unknown bits instead + of panicking. + +## Bugfixes * Fixed a bug where the procedural macro would fail on enums with a repr annotation set. While reprs larger than u8 are supported, negative enum variants or enum variants above 127 are still not currently supported. diff --git a/enumset/src/lib.rs b/enumset/src/lib.rs index 252f376..580deba 100644 --- a/enumset/src/lib.rs +++ b/enumset/src/lib.rs @@ -461,19 +461,18 @@ macro_rules! conversion_impls { conversion_impls! { for_num!(u8, "u8", from_u8, to_u8, - from_u8 try_from_u8 from_u8_truncated to_u8 to_u8_checked to_u8_truncated); + from_u8 try_from_u8 from_u8_truncated as_u8 try_as_u8 as_u8_truncated); for_num!(u16, "u16", from_u16, to_u16, - from_u16 try_from_u16 from_u16_truncated to_u16 to_u16_checked to_u16_truncated); + from_u16 try_from_u16 from_u16_truncated as_u16 try_as_u16 as_u16_truncated); for_num!(u32, "u32", from_u32, to_u32, - from_u32 try_from_u32 from_u32_truncated to_u32 to_u32_checked to_u32_truncated); + from_u32 try_from_u32 from_u32_truncated as_u32 try_as_u32 as_u32_truncated); for_num!(u64, "u64", from_u64, to_u64, - from_u64 try_from_u64 from_u64_truncated to_u64 to_u64_checked to_u64_truncated); + from_u64 try_from_u64 from_u64_truncated as_u64 try_as_u64 as_u64_truncated); for_num!(u128, "u128", from_u128, to_u128, - from_u128 try_from_u128 from_u128_truncated to_u128 - to_u128_checked to_u128_truncated); + from_u128 try_from_u128 from_u128_truncated as_u128 try_as_u128 as_u128_truncated); for_num!(usize, "usize", from_usize, to_usize, from_usize try_from_usize from_usize_truncated - to_usize to_usize_checked to_usize_truncated); + as_usize try_as_usize as_usize_truncated); } impl Default for EnumSet { diff --git a/enumset/tests/ops.rs b/enumset/tests/ops.rs index fda83d5..aece559 100644 --- a/enumset/tests/ops.rs +++ b/enumset/tests/ops.rs @@ -236,7 +236,7 @@ macro_rules! test_enum { #[test] fn to_from_bits() { let value = $e::A | $e::C | $e::D | $e::F | $e::E | $e::G; - assert_eq!(EnumSet::from_u128(value.to_u128()), value); + assert_eq!(EnumSet::from_u128(value.as_u128()), value); } #[test] @@ -382,12 +382,15 @@ macro_rules! bits_tests { } bits_tests!(test_u8_bits, U8, (U16), u8, - to_u8 to_u8_checked to_u8_truncated from_u8 try_from_u8 from_u8_truncated); + as_u8 try_as_u8 as_u8_truncated from_u8 try_from_u8 from_u8_truncated); bits_tests!(test_u16_bits, U16, (U32), u16, - to_u16 to_u16_checked to_u16_truncated from_u16 try_from_u16 from_u16_truncated); + as_u16 try_as_u16 as_u16_truncated from_u16 try_from_u16 from_u16_truncated); bits_tests!(test_u32_bits, U32, (U64), u32, - to_u32 to_u32_checked to_u32_truncated from_u32 try_from_u32 from_u32_truncated); + as_u32 try_as_u32 as_u32_truncated from_u32 try_from_u32 from_u32_truncated); bits_tests!(test_u64_bits, U64, (U128), u64, - to_u64 to_u64_checked to_u64_truncated from_u64 try_from_u64 from_u64_truncated); + as_u64 try_as_u64 as_u64_truncated from_u64 try_from_u64 from_u64_truncated); bits_tests!(test_u128_bits, U128, (), u128, - to_u128 to_u128_checked to_u128_truncated from_u128 try_from_u128 from_u128_truncated); \ No newline at end of file + as_u128 try_as_u128 as_u128_truncated from_u128 try_from_u128 from_u128_truncated); +bits_tests!(test_uize_bits, U32, (U128), usize, + as_usize try_as_usize as_usize_truncated + from_usize try_from_usize from_usize_truncated); \ No newline at end of file