Update CI and benchmark/test features.

.github/workflows/Comprehensive.yml

@@ -10,12 +10,11 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install latest nightly
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
             toolchain: nightly
-            override: true
             components: rustfmt, clippy
       - run: ci/comprehensive.sh
       - run: ALL_FEATURES=1 ci/comprehensive.sh

.github/workflows/Cross.yml

@@ -38,12 +38,11 @@ jobs:
           - x86_64-pc-windows-gnu
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           target: ${{matrix.target}}
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true
@@ -77,12 +76,11 @@ jobs:
           - x86_64-unknown-netbsd
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           target: ${{matrix.target}}
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true

.github/workflows/Features.yml

@@ -10,12 +10,11 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install latest nightly
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
             toolchain: nightly
-            override: true
             components: rustfmt, clippy
       - run: ci/test.sh
       - run: NIGHTLY=1 NO_STD=1 ci/test.sh

.github/workflows/OSX.yml

@@ -15,12 +15,11 @@ jobs:
           - x86_64-apple-darwin
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           target: ${{matrix.target}}
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true

.github/workflows/Simple.yml

@@ -4,18 +4,35 @@ on:
   [push, pull_request, workflow_dispatch]
 
 jobs:
+  build:
+    name: Rust ${{matrix.rust}}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [1.63.0]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{matrix.rust}}
+      - run: cargo check
+      - run: cargo build
+
   test:
     name: Rust ${{matrix.rust}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        rust: [1.51.0, stable, beta, nightly]
+        rust: [1.65.0, stable, beta, nightly]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{matrix.rust}}
       - run: cargo check
@@ -28,7 +45,7 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/Valgrind.yml

@@ -10,12 +10,11 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install latest nightly
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
             toolchain: nightly
-            override: true
       - run: sudo apt-get update
       - run: sudo apt-get install valgrind
       - run: cargo +nightly install cargo-valgrind

ci/check.sh

@@ -4,7 +4,7 @@
 set -ex
 
 # Change to our project home.
-script_dir=`dirname "${BASH_SOURCE[0]}"`
+script_dir=$(dirname "${BASH_SOURCE[0]}")
 cd "$script_dir"/..
 
 scripts/check.sh

ci/comprehensive.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2086,SC2236
 # Run a small subset of our comprehensive test suite.
 
 set -ex
@@ -7,8 +8,8 @@ set -ex
 cargo --version
 
 # Change to our project home.
-script_dir=`dirname "${BASH_SOURCE[0]}"`
-script_home=`realpath "$script_dir"`
+script_dir=$(dirname "${BASH_SOURCE[0]}")
+script_home=$(realpath "$script_dir")
 cd "$script_home"/..
 
 FEATURES=

ci/test.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
+# shellcheck disable=SC2086,SC2236
 # Run main test suite.
 
 set -ex
 
 # Change to our project home.
-script_dir=`dirname "${BASH_SOURCE[0]}"`
+script_dir=$(dirname "${BASH_SOURCE[0]}")
 cd "$script_dir"/..
 
 # Print our cargo version, for debugging.

lexical-asm/src/lib.rs

@@ -83,6 +83,7 @@ pub struct ParseIntError {
     pub kind: IntErrorKind,
 }
 
+#[allow(dead_code)]
 trait FromStrRadixHelper: PartialOrd + Copy {
     fn min_value() -> Self;
     fn max_value() -> Self;

lexical-benchmark/algorithm/Cargo.toml

@@ -16,13 +16,17 @@ default-features = false
 features = []
 
 [dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
-fastrand = "1.4"
+criterion = { version = "0.5.0", features = ["html_reports"] }
+fastrand = "2.1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 
 [features]
-default = ["std", "integers"]
+default = ["std", "integers", "floats", "json"]
 std = ["lexical-util/std", "lexical-parse-float/std"]
 integers = []
+floats = []
+json = []
 
 [[bench]]
 name = "bigint"

lexical-benchmark/algorithm/bigint.rs

@@ -187,7 +187,7 @@ fn karatsuba_mul_algo(big: &mut bigint::Bigint, y: &[bigint::Limb]) {
 // GENERATOR
 
 #[inline(always)]
-fn new_limb(rng: &Rng) -> bigint::Limb {
+fn new_limb(rng: &mut Rng) -> bigint::Limb {
     if bigint::LIMB_BITS == 32 {
         rng.u32(..) as bigint::Limb
     } else {
@@ -200,10 +200,10 @@ macro_rules! generator {
         $group.bench_function($name, |bench| {
             let mut big = bigint::Bigint::new();
             let seed = fastrand::u64(..);
-            let rng = Rng::with_seed(seed);
+            let mut rng = Rng::with_seed(seed);
             bench.iter(|| {
                 unsafe { big.data.set_len(0) };
-                big.data.try_push(new_limb(&rng)).unwrap();
+                big.data.try_push(new_limb(&mut rng)).unwrap();
                 // Don't go any higher than 300.
                 $cb(&mut big, rng.u32(1..300));
                 black_box(&big);
@@ -220,18 +220,18 @@ macro_rules! generator {
         $group.bench_function($name, |bench| {
             let mut big = bigint::Bigint::new();
             let seed = fastrand::u64(..);
-            let rng = Rng::with_seed(seed);
+            let mut rng = Rng::with_seed(seed);
             bench.iter(|| {
                 unsafe { big.data.set_len(0) };
                 // Don't go higher than 20, since we a minimum of 60 limbs.
                 let count = rng.usize(1..20);
                 for _ in 0..count {
-                    big.data.try_push(new_limb(&rng)).unwrap();
+                    big.data.try_push(new_limb(&mut rng)).unwrap();
                 }
                 let count = rng.usize(1..20);
                 let mut vec: Vec<bigint::Limb> = Vec::new();
                 for _ in 0..count {
-                    vec.push(new_limb(&rng));
+                    vec.push(new_limb(&mut rng));
                 }
 
                 // Don't go any higher than 300.

lexical-benchmark/algorithm/division.rs

@@ -35,7 +35,7 @@ fn fast_div(v: u32) -> (u32, u32) {
     let max_precision = 14;
     let additional_precision = 5;
 
-    let left_end = (((1 << (max_precision + additional_precision)) + divisor - 1) / divisor) as u32;
+    let left_end = ((1 << (max_precision + additional_precision)) + divisor - 1) / divisor;
     let quotient = (v.wrapping_mul(left_end)) >> (max_precision + additional_precision);
     let remainder = v - divisor * quotient;
 

lexical-benchmark/input.rs

@@ -395,16 +395,12 @@ macro_rules! to_lexical_generator {
 
 macro_rules! dtoa_generator {
     ($group:ident, $name:expr, $iter:expr) => {{
-        use lexical_util::constants::BUFFER_SIZE;
-        let mut buffer = vec![b'0'; BUFFER_SIZE];
+        let mut buffer = dtoa::Buffer::new();
         $group.bench_function($name, |bench| {
             bench.iter(|| {
                 $iter.for_each(|x| {
-                    dtoa::write(&mut buffer, *x).unwrap();
+                    dtoa::format(&mut buffer, *x).unwrap();
                     black_box(&buffer);
-                    unsafe {
-                        buffer.set_len(0);
-                    } // Way faster than Vec::clear().
                 })
             })
         });
@@ -502,7 +498,8 @@ macro_rules! parse_integer_generator {
 macro_rules! write_float_generator {
     ($group:ident, $type:expr, $iter:expr, $fmt:ident) => {{
         to_lexical_generator!($group, concat!("write_", $type, "_lexical"), $iter);
-        dtoa_generator!($group, concat!("write_", $type, "_dtoa"), $iter);
+        // FIXME: Restore dtoa format later
+        //dtoa_generator!($group, concat!("write_", $type, "_dtoa"), $iter);
         ryu_generator!($group, concat!("write_", $type, "_ryu"), $iter, $fmt);
         fmt_generator!($group, concat!("write_", $type, "_fmt"), $iter);
     }};

lexical-benchmark/parse-float/Cargo.toml

@@ -16,8 +16,8 @@ default-features = false
 features = []
 
 [dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
-fastrand = "1.4"
+criterion = { version = "0.5", features = ["html_reports"] }
+fastrand = "2.1.0"
 lazy_static = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -30,7 +30,9 @@ power-of-two = ["lexical-util/power-of-two", "lexical-parse-float/power-of-two"]
 format = ["lexical-util/format", "lexical-parse-float/format"]
 compact = ["lexical-util/compact", "lexical-parse-float/compact"]
 asm = []
-floats = []
+nightly = ["lexical-parse-float/nightly"]
+integers = ["lexical-util/integers"]
+floats = ["lexical-util/floats"]
 json = []
 
 [[bench]]

lexical-benchmark/parse-float/black_box.rs

@@ -15,6 +15,7 @@ pub fn black_box(mut dummy: f64) -> f64 {
 
 // Optimized black box using the nicer assembly syntax.
 #[cfg(not(feature = "asm"))]
+#[allow(forgetting_copy_types)]
 pub fn black_box(dummy: f64) -> f64 {
     unsafe {
         let x = core::ptr::read_volatile(&dummy);

lexical-benchmark/parse-integer/Cargo.toml

@@ -16,8 +16,8 @@ default-features = false
 features = []
 
 [dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
-fastrand = "1.4"
+criterion = { version = "0.5.0", features = ["html_reports"] }
+fastrand = "2.1.0"
 lazy_static = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -30,6 +30,7 @@ power-of-two = ["lexical-util/power-of-two", "lexical-parse-integer/power-of-two
 format = ["lexical-util/format", "lexical-parse-integer/format"]
 compact = ["lexical-util/compact", "lexical-parse-integer/compact"]
 integers = []
+floats = []
 json = []
 
 [[bench]]

lexical-benchmark/write-float/Cargo.toml

@@ -18,7 +18,7 @@ features = []
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
 dtoa = "1.0.9"
-fastrand = "2.1.1"
+fastrand = "2.1.0"
 lazy_static = "1"
 ryu = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -31,6 +31,7 @@ radix = ["lexical-util/radix", "lexical-write-float/radix"]
 power-of-two = ["lexical-util/power-of-two", "lexical-write-float/power-of-two"]
 format = ["lexical-util/format", "lexical-write-float/format"]
 compact = ["lexical-util/compact", "lexical-write-float/compact"]
+integers = []
 floats = []
 json = []
 

lexical-benchmark/write-integer/Cargo.toml

@@ -16,9 +16,9 @@ default-features = false
 features = []
 
 [dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
+criterion = { version = "0.5.0", features = ["html_reports"] }
 itoa = { version = "0.4", features = ["i128"] }
-fastrand = "1.4"
+fastrand = "2.1.0"
 lazy_static = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -31,6 +31,7 @@ power-of-two = ["lexical-util/power-of-two", "lexical-write-integer/power-of-two
 format = ["lexical-util/format", "lexical-write-integer/format"]
 compact = ["lexical-util/compact", "lexical-write-integer/compact"]
 integers = []
+floats = []
 json = []
 
 [[bench]]

lexical-parse-float/Cargo.toml

@@ -38,7 +38,7 @@ static_assertions = "1"
 #  Issue:   https://github.com/BurntSushi/quickcheck/issues/295
 #  Fix:     https://github.com/BurntSushi/quickcheck/pull/296
 quickcheck = { git = "https://github.com/neithernut/quickcheck/", branch = "i32min-shrink-bound" }
-proptest = "1.5.0"
+proptest = ">=1.5.0"
 
 [features]
 default = ["std"]

lexical-parse-integer/Cargo.toml

@@ -32,7 +32,7 @@ features = ["parse-integers"]
 #  Issue:   https://github.com/BurntSushi/quickcheck/issues/295
 #  Fix:     https://github.com/BurntSushi/quickcheck/pull/296
 quickcheck = { git = "https://github.com/neithernut/quickcheck/", branch = "i32min-shrink-bound" }
-proptest = "1.5.0"
+proptest = ">=1.5.0"
 
 [features]
 default = ["std"]