Sync upstream/master (#48)

HalidOdat · dtolnay · web-flow · commit 8b82fc24ce32 · 2025-02-16T12:43:37.000Z
* Explicitly install a Rust toolchain for cargo-outdated job Debugging a recent cargo-outdated bug, it would have been nice not to wonder whether a rustc version change in GitHub's runner image was a contributing factor. * Resolve unexpected_cfgs warning warning: unexpected `cfg` condition name: `exhaustive` --> tests/exhaustive.rs:1:8 | 1 | #![cfg(exhaustive)] | ^^^^^^^^^^ | = help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows` = help: consider using a Cargo feature instead or adding `println!("cargo::rustc-check-cfg=cfg(exhaustive)");` to the top of the `build.rs` = note: see <https://doc.rust-lang.org/nightly/cargo/reference/build-scripts.html#rustc-check-cfg> for more information about checking conditional configuration = note: `#[warn(unexpected_cfgs)]` on by default * Move allow(unexpected_cfgs) to the crate where cfg(exhaustive) is used * Skip rerunning build script on library code changes * Ignore cast_possible_truncation pedantic clippy lint in test warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers --> tests/exhaustive.rs:20:25 | 20 | let batch = counter.fetch_add(1, Ordering::Relaxed) as u32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ... = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation = note: `-W clippy::cast-possible-truncation` implied by `-W clippy::pedantic` = help: to override `-W clippy::pedantic` add `#[allow(clippy::cast_possible_truncation)]` help: ... or use `try_from` and handle the error accordingly | 20 | let batch = u32::try_from(counter.fetch_add(1, Ordering::Relaxed)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Mark exhaustive test #[ignore] in non-cfg(exhaustive) * Fill in ignore reasons in all #[ignore] attributes * Upload CI Cargo.lock for reproducing failures * Prevent upload-artifact step from causing CI failure This step has been failing way more than reasonable across my various repos. With the provided path, there will be 1 file uploaded Artifact name is valid! Root directory input is valid! Attempt 1 of 5 failed with error: Request timeout: /twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact. Retrying request in 3000 ms... Attempt 2 of 5 failed with error: Request timeout: /twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact. Retrying request in 6029 ms... Attempt 3 of 5 failed with error: Request timeout: /twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact. Retrying request in 8270 ms... Attempt 4 of 5 failed with error: Request timeout: /twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact. Retrying request in 12577 ms... Error: Failed to CreateArtifact: Failed to make request after 5 attempts: Request timeout: /twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact * Remove **/*.rs.bk from project-specific gitignore Cargo stopped generating this in its project template 5 years ago. It would belong in a global gitignore instead. * More precise gitignore patterns * Update rand crate to 0.9 * Unset doc-scrape-examples for lib target False is the default value since Cargo PR 11499. * Fix clippy warnings --------- Co-authored-by: David Tolnay <dtolnay@gmail.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,12 @@ jobs:
       - run: cargo test --features small
       - run: cargo build --tests --features no-panic --release
         if: matrix.rust == 'nightly'
+      - uses: actions/upload-artifact@v4
+        if: matrix.rust == 'nightly' && always()
+        with:
+          name: Cargo.lock
+          path: Cargo.lock
+        continue-on-error: true
 
   msrv:
     name: Rust 1.64.0
@@ -89,6 +95,7 @@ jobs:
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - uses: dtolnay/install@cargo-outdated
       - run: cargo outdated --workspace --exit-code 1
       - run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/target
+/target/
 /upstream
-**/*.rs.bk
-Cargo.lock
+/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ 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 = ["performance.png", "chart/**"]
+exclude = ["build.rs", "performance.png", "chart/**"]
 keywords = ["float"]
 license = "Apache-2.0 OR BSL-1.0"
 repository = "https://github.com/boa-dev/ryu-js"
@@ -24,13 +24,12 @@ no-panic = { version = "0.1", optional = true }
 
 [dev-dependencies]
 num_cpus = "1.8"
-rand = "0.8"
-rand_xorshift = "0.3"
+rand = "0.9"
+rand_xorshift = "0.4"
 criterion = "0.5"
 
 [lib]
 bench = false
-doc-scrape-examples = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/build.rs b/build.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // Warning: build.rs is not published to crates.io.
+
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rustc-cfg=check_cfg");
+    println!("cargo:rustc-check-cfg=cfg(check_cfg)");
+    println!("cargo:rustc-check-cfg=cfg(exhaustive)");
+}
diff --git a/chart/.gitignore b/chart/.gitignore
@@ -1,7 +1,7 @@
-*.aux
-*.fdb_latexmk
-*.fls
-*.log
-*.pdf
-*.png
-*.svg
+/*.aux
+/*.fdb_latexmk
+/*.fls
+/*.log
+/*.pdf
+/*.png
+/*.svg
diff --git a/examples/upstream_benchmark.rs b/examples/upstream_benchmark.rs
@@ -45,7 +45,7 @@ macro_rules! benchmark {
             let mut throwaway = 0;
             for _ in 0..SAMPLES {
                 let f = loop {
-                    let f = $ty::from_bits(rng.gen());
+                    let f = $ty::from_bits(rng.random());
                     if f.is_finite() {
                         break f;
                     }
diff --git a/fuzz/.gitignore b/fuzz/.gitignore
@@ -1,4 +1,5 @@
-artifacts/
-corpus/
-coverage/
-target/
+/artifacts/
+/corpus/
+/coverage/
+/target/
+/Cargo.lock
diff --git a/src/f2s_intrinsics.rs b/src/f2s_intrinsics.rs
@@ -67,7 +67,7 @@ fn mul_shift_32(m: u32, factor: u64, shift: i32) -> u32 {
 
     let sum = (bits0 >> 32) + bits1;
     let shifted_sum = sum >> (shift - 32);
-    debug_assert!(shifted_sum <= u32::max_value() as u64);
+    debug_assert!(shifted_sum <= u32::MAX as u64);
     shifted_sum as u32
 }
 
diff --git a/src/pretty/to_fixed/mod.rs b/src/pretty/to_fixed/mod.rs
@@ -18,10 +18,10 @@ mod d2fixed_full_table;
 ///
 /// - 1 byte for sign (-)
 /// - `22` bytes for whole part:
-///     Because we have a check for if `>= 1e21` (1 byte extra, just in case)
+///   Because we have a check for if `>= 1e21` (1 byte extra, just in case)
 /// - `1` byte for dot (`.`)
 /// - `108` (`9 * 12`) bytes for fraction part:
-///     We write digits in blocks, which consist of `9` digits.
+///   We write digits in blocks, which consist of `9` digits.
 ///
 /// Total: `1 + 22 + 1 + 108 = 132`
 pub const MAX_BUFFER_SIZE: usize = 132;
@@ -123,7 +123,7 @@ impl Cursor {
     /// The caller has to guarantee that:
     ///
     /// - 10^(olength-1) <= digits < 10^olength
-    /// e.g., by passing `olength` as `decimalLength9(digits)`.
+    ///   e.g., by passing `olength` as `decimalLength9(digits)`.
     ///
     /// - That the buffer has enough space for the decimal length of the given integer.
     #[cfg_attr(feature = "no-panic", no_panic)]
diff --git a/tests/d2s_test.rs b/tests/d2s_test.rs
@@ -69,7 +69,7 @@ fn test_random() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)]
+#[cfg_attr(miri, ignore = "too slow for miri")]
 fn test_non_finite() {
     for i in 0u64..1 << 23 {
         let f = f64::from_bits((((1 << 11) - 1) << 52) + (i << 29));
diff --git a/tests/exhaustive.rs b/tests/exhaustive.rs
@@ -1,11 +1,13 @@
-#![cfg(exhaustive)]
+#![cfg_attr(not(check_cfg), allow(unexpected_cfgs))]
+#![allow(clippy::cast_possible_truncation)]
 
 use std::str;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::thread;
 
 #[test]
+#[cfg_attr(not(exhaustive), ignore = "requires cfg(exhaustive)")]
 fn test_exhaustive() {
     const BATCH_SIZE: u32 = 1_000_000;
     let counter = Arc::new(AtomicUsize::new(0));
@@ -17,25 +19,25 @@ fn test_exhaustive() {
         let finished = finished.clone();
         workers.push(thread::spawn(move || loop {
             let batch = counter.fetch_add(1, Ordering::Relaxed) as u32;
-            if batch > u32::max_value() / BATCH_SIZE {
+            if batch > u32::MAX / BATCH_SIZE {
                 return;
             }
 
             let min = batch * BATCH_SIZE;
-            let max = if batch == u32::max_value() / BATCH_SIZE {
-                u32::max_value()
+            let max = if batch == u32::MAX / BATCH_SIZE {
+                u32::MAX
             } else {
                 min + BATCH_SIZE - 1
             };
 
             let mut bytes = [0u8; 24];
-            let mut buffer = ryu::Buffer::new();
+            let mut buffer = ryu_js::Buffer::new();
             for u in min..=max {
                 let f = f32::from_bits(u);
                 if !f.is_finite() {
                     continue;
                 }
-                let n = unsafe { ryu::raw::format32(f, &mut bytes[0]) };
+                let n = unsafe { ryu_js::raw::format32(f, &mut bytes[0]) };
                 assert_eq!(Ok(Ok(f)), str::from_utf8(&bytes[..n]).map(str::parse));
                 assert_eq!(Ok(f), buffer.format_finite(f).parse());
             }
diff --git a/tests/f2s_test.rs b/tests/f2s_test.rs
@@ -59,7 +59,7 @@ fn test_random() {
 }
 
 #[test]
-#[cfg_attr(miri, ignore)]
+#[cfg_attr(miri, ignore = "too slow for miri")]
 fn test_non_finite() {
     for i in 0u32..1 << 23 {
         let f = f32::from_bits((((1 << 8) - 1) << 23) + i);

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
 -*.aux
 -*.fdb_latexmk
 -*.fls
 -*.log
 -*.pdf
 -*.png
 -*.svg
 +/*.aux
 +/*.fdb_latexmk
 +/*.fls
 +/*.log
 +/*.pdf
 +/*.png
 +/*.svg
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ macro_rules! benchmark {`
`45`	`45`	`let mut throwaway = 0;`
`46`	`46`	`for _ in 0..SAMPLES {`
`47`	`47`	`let f = loop {`
`48`		`- let f = $ty::from_bits(rng.gen());`
	`48`	`+ let f = $ty::from_bits(rng.random());`
`49`	`49`	`if f.is_finite() {`
`50`	`50`	`break f;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ fn mul_shift_32(m: u32, factor: u64, shift: i32) -> u32 {`
`67`	`67`
`68`	`68`	`let sum = (bits0 >> 32) + bits1;`
`69`	`69`	`let shifted_sum = sum >> (shift - 32);`
`70`		`- debug_assert!(shifted_sum <= u32::max_value() as u64);`
	`70`	`+ debug_assert!(shifted_sum <= u32::MAX as u64);`
`71`	`71`	`shifted_sum as u32`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ fn test_random() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`#[test]`
`72`		`-#[cfg_attr(miri, ignore)]`
	`72`	`+#[cfg_attr(miri, ignore = "too slow for miri")]`
`73`	`73`	`fn test_non_finite() {`
`74`	`74`	`for i in 0u64..1 << 23 {`
`75`	`75`	`let f = f64::from_bits((((1 << 11) - 1) << 52) + (i << 29));`