diff options
| author | bors <bors@rust-lang.org> | 2020-06-25 17:37:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-25 17:37:02 +0000 |
| commit | 50fc24d8a172a853b5dfe40702d6550e3b8562ba (patch) | |
| tree | 76deb7c9dc12ef5ae3500c5292d23161da098de4 /src/libcore/tests | |
| parent | 9f3c96b869b48ecd0bb556c6ad9cd603b4dacfb9 (diff) | |
| parent | 6c8d8d6a6055d19dc33cc8b33b082d17583a0e47 (diff) | |
| download | rust-50fc24d8a172a853b5dfe40702d6550e3b8562ba.tar.gz rust-50fc24d8a172a853b5dfe40702d6550e3b8562ba.zip | |
Auto merge of #72717 - poliorcetics:try-from-int-to-nzint, r=dtolnay
Add TryFrom<{int}> for NonZero{int}
Adds `TryFrom<{int}> for NonZero{int}`.
It uses the existing `NonZero{int}::new()` and `Option::ok_or()` functions, meaning the checks are not repeated.
I also added tests, I tried to follow the convention I saw in the test file.
I also used `#[stable(feature = "nzint_try_from_int_conv", since = "1.46.0")]`, but I have no idea if the feature/version are correctly named or even correct.
Diffstat (limited to 'src/libcore/tests')
| -rw-r--r-- | src/libcore/tests/nonzero.rs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/libcore/tests/nonzero.rs b/src/libcore/tests/nonzero.rs index 0227a66b863..48aec6d718d 100644 --- a/src/libcore/tests/nonzero.rs +++ b/src/libcore/tests/nonzero.rs @@ -1,3 +1,4 @@ +use core::convert::TryFrom; use core::num::{IntErrorKind, NonZeroI32, NonZeroI8, NonZeroU32, NonZeroU8}; use core::option::Option::{self, None, Some}; use std::mem::size_of; @@ -176,3 +177,21 @@ fn test_nonzero_bitor_assign() { target |= 0; assert_eq!(target.get(), 0b1011_1111); } + +#[test] +fn test_nonzero_from_int_on_success() { + assert_eq!(NonZeroU8::try_from(5), Ok(NonZeroU8::new(5).unwrap())); + assert_eq!(NonZeroU32::try_from(5), Ok(NonZeroU32::new(5).unwrap())); + + assert_eq!(NonZeroI8::try_from(-5), Ok(NonZeroI8::new(-5).unwrap())); + assert_eq!(NonZeroI32::try_from(-5), Ok(NonZeroI32::new(-5).unwrap())); +} + +#[test] +fn test_nonzero_from_int_on_err() { + assert!(NonZeroU8::try_from(0).is_err()); + assert!(NonZeroU32::try_from(0).is_err()); + + assert!(NonZeroI8::try_from(0).is_err()); + assert!(NonZeroI32::try_from(0).is_err()); +} |
