möbius(0) is well defined, so just take a u64 instead of a NonZeroU64

JSorngard · Oct 13, 2023 · 7c2ffc3 · 7c2ffc3
1 parent 22f755b
commit 7c2ffc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/benches/prime_benches.rs b/benches/prime_benches.rs
@@ -24,9 +24,7 @@ fn benchmarks(c: &mut Criterion) {
         b.iter(|| black_box(are_prime::<10_000>()))
     });
 
-    let ints: Vec<_> = (1..1_000_000)
-        .map(|n| core::num::NonZeroU64::new(n).unwrap())
-        .collect();
+    let ints: Vec<_> = (1..1_000_000).map(|n| n).collect();
     c.bench_function("möbius of first 1e6 integers", |b| {
         b.iter(|| {
             for &i in &ints {

diff --git a/src/lib.rs b/src/lib.rs
@@ -347,13 +347,11 @@ pub const fn are_prime<const N: usize>() -> [bool; N] {
 /// # Example
 /// ```
 /// # use const_primes::moebius;
-/// use core::num::NonZeroU64;
-/// const N: NonZeroU64 = match NonZeroU64::new(1001) {Some(i) => i, None => panic!()};
+/// const N: u64 = 1001;
 /// const MÖBIUS1001: i8 = moebius(N);
 /// assert_eq!(MÖBIUS1001, -1);
 /// ```
-pub const fn moebius(x: core::num::NonZeroU64) -> i8 {
-    let mut x = x.get();
+pub const fn moebius(mut x: u64) -> i8 {
     let mut prime_count: u64 = 0;
 
     // We avoid code repetition with the use of this macro.
@@ -531,16 +529,15 @@ mod test {
 
     #[test]
     fn check_möbius() {
-        use core::num::NonZeroU64;
         #[rustfmt::skip]
-        const TEST_CASES: [i8; 50] = [1, -1, -1, 0, -1, 1, -1, 0, 0, 1, -1, 0, -1, 1, 1, 0, -1, 0, -1, 0, 1, 1, -1, 0, 0, 1, 0, 0, -1, -1, -1, 0, 1, 1, 1, 0, -1, 1, 1, 0, -1, -1, -1, 0, 0, 1, -1, 0, 0, 0];
+        const TEST_CASES: [i8; 51] = [0, 1, -1, -1, 0, -1, 1, -1, 0, 0, 1, -1, 0, -1, 1, 1, 0, -1, 0, -1, 0, 1, 1, -1, 0, 0, 1, 0, 0, -1, -1, -1, 0, 1, 1, 1, 0, -1, 1, 1, 0, -1, -1, -1, 0, 0, 1, -1, 0, 0, 0];
         for (n, ans) in TEST_CASES.into_iter().enumerate() {
-            assert_eq!(moebius(NonZeroU64::new(n as u64 + 1).unwrap()), ans);
+            assert_eq!(moebius(n as u64), ans);
         }
         #[rustfmt::skip]
         const BIG_TEST_CASES: [i8; 51] = [0, -1, -1, 1, 0, -1, 1, 1, 0, -1, -1, 1, 0, -1, 0, -1, 0, 0, 1, -1, 0, -1, -1, -1, 0, 0, 0, 1, 0, 0, -1, -1, 0, -1, -1, 0, 0, 1, -1, -1, 0, 1, 1, 1, 0, -1, 1, 1, 0, -1, 0];
         for (n, ans) in BIG_TEST_CASES.into_iter().enumerate() {
-            assert_eq!(moebius(NonZeroU64::new(n as u64 + 1000).unwrap()), ans);
+            assert_eq!(moebius(n as u64 + 1000), ans);
         }
     }