Sync upstream/main

.clippy.toml

@@ -1 +1 @@
-msrv = "1.64.0"
+msrv = "1.71.0"

.github/workflows/ci.yml

@@ -25,34 +25,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable]
+        rust: [nightly, beta, stable, 1.86.0]
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
       - name: Enable type layout randomization
         run: echo RUSTFLAGS=${RUSTFLAGS}\ -Zrandomize-layout >> $GITHUB_ENV
         if: matrix.rust == 'nightly'
+      - run: cargo build
       - run: cargo test
+      - run: cargo build --features small
       - run: cargo test --features small
       - run: cargo build --tests --features no-panic --release
         if: matrix.rust == 'nightly'
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: matrix.rust == 'nightly' && always()
         with:
           name: Cargo.lock
           path: Cargo.lock
         continue-on-error: true
 
   msrv:
-    name: Rust 1.64.0
+    name: Rust 1.71.0
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.64.0
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@1.71.0
       - run: cargo build
       - run: cargo build --features small
 
@@ -63,20 +65,32 @@ jobs:
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@nightly
       - uses: dtolnay/install@cargo-docs-rs
       - run: cargo docs-rs
 
   miri:
-    name: Miri
+    name: Miri (${{matrix.name}})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 64-bit little endian
+            target: x86_64-unknown-linux-gnu
+          - name: 64-bit big endian
+            target: powerpc64-unknown-linux-gnu
+          - name: 32-bit little endian
+            target: i686-unknown-linux-gnu
+          - name: 32-bit big endian
+            target: mips-unknown-linux-gnu
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@miri
       - run: cargo miri setup
-      - run: cargo miri test
+      - run: cargo miri test --target ${{matrix.target}}
         env:
           MIRIFLAGS: -Zmiri-strict-provenance
 
@@ -85,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@clippy
       - run: cargo clippy --tests --benches -- -Dclippy::all -Dclippy::pedantic
 
@@ -94,18 +108,18 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
       - uses: dtolnay/install@cargo-outdated
-      - run: cargo outdated --workspace --exit-code 1
+      - run: cargo outdated --workspace --ignore rand,rand_core,rand_xorshift --exit-code 1
       - run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
 
   fuzz:
     name: Fuzz
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@nightly
       - uses: dtolnay/install@cargo-fuzz
       - run: cargo fuzz check

Cargo.toml

@@ -5,12 +5,12 @@ authors = ["David Tolnay <dtolnay@gmail.com>", "boa-dev"]
 categories = ["value-formatting", "no-std", "no-std::no-alloc"]
 description = "Fast floating point to string conversion, ECMAScript compliant."
 documentation = "https://docs.rs/ryu-js"
-edition = "2018"
-exclude = ["build.rs", "performance.png", "chart/**"]
+edition = "2021"
+exclude = ["build.rs", "*.png"]
 keywords = ["float"]
 license = "Apache-2.0 OR BSL-1.0"
 repository = "https://github.com/boa-dev/ryu-js"
-rust-version = "1.64"
+rust-version = "1.71"
 
 [features]
 # Use smaller lookup tables. Instead of storing every required power of
@@ -24,19 +24,28 @@ no-panic = { version = "0.1", optional = true }
 
 [dev-dependencies]
 num_cpus = "1.8"
-rand = "0.9"
-rand_xorshift = "0.4"
-criterion = "0.5"
+rand = "0.10"
+rand_core = "0.10"
+rand_xorshift = "0.5"
+
+[target.'cfg(not(miri))'.dev-dependencies]
+criterion = { version = "0.8", default-features = false }
 
 [lib]
 bench = false
 
+[[bench]]
+name = "bench"
+harness = false
+
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 # See: https://github.com/rust-lang/rust/pull/84176
-rustdoc-args = ["--generate-link-to-definition"]
-
-[[bench]]
-name = "bench"
-harness = false
+rustdoc-args = [
+    "--generate-link-to-definition",
+    "--generate-macro-expansion",
+    "--extern-html-root-url=core=https://doc.rust-lang.org",
+    "--extern-html-root-url=alloc=https://doc.rust-lang.org",
+    "--extern-html-root-url=std=https://doc.rust-lang.org",
+]

README.md

@@ -16,11 +16,8 @@ under the creative commons CC-BY-SA license.
 This Rust implementation is a line-by-line port of Ulf Adams' implementation in
 C, [https://github.com/ulfjack/ryu][upstream].
 
-*Requirements: This crate supports any compiler version back to rustc 1.64; it
-uses nothing from the Rust standard library so is usable from no_std crates.*
-
 [paper]: https://dl.acm.org/citation.cfm?id=3192369
-[upstream]: https://github.com/ulfjack/ryu/tree/abf76d252bc97300354857e64e80d4a2bf664291
+[upstream]: https://github.com/ulfjack/ryu/tree/e3e090c66efd258a0cee50ee93411ec99668d416
 
 ```toml
 [dependencies]
@@ -39,15 +36,7 @@ fn main() {
 }
 ```
 
-## Performance 
-
-<!--
-
-## Performance (lower is better)
-
-![performance](https://raw.githubusercontent.com/boa-dev/ryu-js/master/performance.png)
-
--->
+## Performance
 
 You can run upstream's benchmarks with:
 

benches/bench.rs

@@ -1,59 +1,42 @@
-// cargo bench
-
-#![allow(
-    clippy::approx_constant,
-    clippy::excessive_precision,
-    clippy::unreadable_literal
-)]
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
+use std::fmt::Display;
+use std::hint;
 use std::io::Write;
+use std::{f32, f64};
 
-macro_rules! benches {
-    ($($name:ident($value:expr),)*) => {
-        mod bench_ryu_js {
-            use super::*;
-            $(
-                pub fn $name(c: &mut Criterion) {
-                    let mut buf = ryu_js::Buffer::new();
-
-                    c.bench_function(concat!("ryu_js_", stringify!($name)), move |b| b.iter(move || {
-                        let value = black_box($value);
-                        let formatted = buf.format_finite(value);
-                        black_box(formatted);
-                    }));
-                }
-            )*
-        }
-        criterion_group!(bench_ryu_js, $( bench_ryu_js::$name, )*);
+fn do_bench(c: &mut Criterion, group_name: &str, float: impl ryu_js::Float + Display) {
+    let mut group = c.benchmark_group(group_name);
+    group.bench_function("ryu_js", |b| {
+        let mut buf = ryu_js::Buffer::new();
+        b.iter(move || {
+            let float = hint::black_box(float);
+            let formatted = buf.format_finite(float);
+            hint::black_box(formatted);
+        });
+    });
+    group.bench_function("std::fmt", |b| {
+        let mut buf = Vec::with_capacity(20);
+        b.iter(|| {
+            buf.clear();
+            let float = hint::black_box(float);
+            write!(&mut buf, "{float}").unwrap();
+            hint::black_box(buf.as_slice());
+        });
+    });
+    group.finish();
+}
 
-        mod bench_std_fmt {
-            use super::*;
-            $(
-                pub fn $name(c: &mut Criterion) {
-                    let mut buf = Vec::with_capacity(20);
+fn bench(c: &mut Criterion) {
+    do_bench(c, "f64[0]", 0f64);
+    do_bench(c, "f64[short]", 0.1234f64);
+    do_bench(c, "f64[e]", f64::consts::E);
+    do_bench(c, "f64[max]", f64::MAX);
 
-                    c.bench_function(concat!("std_fmt_", stringify!($name)), move |b| b.iter(|| {
-                        buf.clear();
-                        let value = black_box($value);
-                        write!(&mut buf, "{}", value).unwrap();
-                        black_box(buf.as_slice());
-                    }));
-                }
-            )*
-        }
-        criterion_group!(bench_std_fmt, $( bench_std_fmt::$name, )*);
-        criterion_main!(bench_ryu_js, bench_std_fmt);
-    };
+    do_bench(c, "f32[0]", 0f32);
+    do_bench(c, "f32[short]", 0.1234f32);
+    do_bench(c, "f32[e]", f32::consts::E);
+    do_bench(c, "f32[max]", f32::MAX);
 }
 
-benches! {
-    bench_0_f64(0_f64),
-    bench_short_f64(0.1234_f64),
-    bench_e_f64(2.718281828459045_f64),
-    bench_max_f64(f64::MAX),
-    bench_0_f32(0_f32),
-    bench_short_f32(0.1234_f32),
-    bench_e_f32(2.718281828459045_f32),
-    bench_max_f32(f32::MAX),
-}
+criterion_group!(benches, bench);
+criterion_main!(benches);

examples/upstream_benchmark.rs

@@ -1,6 +1,6 @@
 // cargo run --example upstream_benchmark --release
 
-use rand::{Rng, SeedableRng};
+use rand::{RngExt as _, SeedableRng as _};
 
 const SAMPLES: usize = 10000;
 const ITERATIONS: usize = 1000;