Enable merge queue (#38)

* Enable merge queue

* Update CI action

* Trigger actions

* Remove pre-ci from actions

* Update ci.yml

* Fix clippy lints

* Test if the msrv is tested correctly in the ci

* Revert latest commit

* Update criterion to v0.5

* Increase msrv to 1.60

* Set MSRV to 1.64

* Fix clippy lints

* Fix clippy lints

---------

Co-authored-by: raskad <32105367+raskad@users.noreply.github.com>

Author: jedel1043

.clippy.toml

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

.github/workflows/ci.yml

@@ -1,10 +1,16 @@
 name: CI
 
 on:
-  push:
   pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
   workflow_dispatch:
   schedule: [cron: "40 1 * * *"]
+  merge_group:
+    types: [checks_requested]
 
 permissions:
   contents: read
@@ -13,13 +19,8 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  pre_ci:
-    uses: dtolnay/.github/.github/workflows/pre_ci.yml@master
-
   test:
     name: Rust ${{matrix.rust}}
-    needs: pre_ci
-    if: needs.pre_ci.outputs.continue
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -40,21 +41,17 @@ jobs:
         if: matrix.rust == 'nightly'
 
   msrv:
-    name: Rust 1.36.0
-    needs: pre_ci
-    if: needs.pre_ci.outputs.continue
+    name: Rust 1.64.0
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.36.0
+      - uses: dtolnay/rust-toolchain@1.64.0
       - run: cargo build
       - run: cargo build --features small
 
   miri:
     name: Miri
-    needs: pre_ci
-    if: needs.pre_ci.outputs.continue
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
@@ -67,7 +64,6 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
@@ -77,7 +73,6 @@ jobs:
   outdated:
     name: Outdated
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
@@ -87,13 +82,10 @@ jobs:
 
   fuzz:
     name: Fuzz
-    needs: pre_ci
-    if: needs.pre_ci.outputs.continue
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - uses: dtolnay/install@cargo-fuzz
       - run: cargo fuzz check
-

Cargo.toml

@@ -10,7 +10,7 @@ exclude = ["performance.png", "chart/**"]
 keywords = ["float"]
 license = "Apache-2.0 OR BSL-1.0"
 repository = "https://github.com/boa-dev/ryu-js"
-rust-version = "1.36"
+rust-version = "1.64"
 
 [features]
 # Use smaller lookup tables. Instead of storing every required power of
@@ -26,7 +26,7 @@ no-panic = { version = "0.1", optional = true }
 num_cpus = "1.8"
 rand = "0.8"
 rand_xorshift = "0.3"
-criterion = "0.4"
+criterion = "0.5"
 
 [lib]
 bench = false

README.md

@@ -15,7 +15,7 @@ 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.36; it
+*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

src/buffer/mod.rs

@@ -74,9 +74,9 @@ impl Buffer {
     #[cfg_attr(feature = "no-panic", no_panic)]
     pub fn format_finite<F: Float>(&mut self, f: F) -> &str {
         unsafe {
-            let n = f.write_to_ryu_buffer(self.bytes.as_mut_ptr() as *mut u8);
+            let n = f.write_to_ryu_buffer(self.bytes.as_mut_ptr().cast::<u8>());
             debug_assert!(n <= self.bytes.len());
-            let slice = slice::from_raw_parts(self.bytes.as_ptr() as *const u8, n);
+            let slice = slice::from_raw_parts(self.bytes.as_ptr().cast::<u8>(), n);
             str::from_utf8_unchecked(slice)
         }
     }
@@ -87,7 +87,7 @@ impl Copy for Buffer {}
 impl Clone for Buffer {
     #[inline]
     fn clone(&self) -> Self {
-        Buffer::new()
+        *self
     }
 }
 

src/lib.rs

@@ -14,11 +14,9 @@
 //! # Example
 //!
 //! ```
-//! fn main() {
-//!     let mut buffer = ryu_js::Buffer::new();
-//!     let printed = buffer.format(1.234);
-//!     assert_eq!(printed, "1.234");
-//! }
+//! let mut buffer = ryu_js::Buffer::new();
+//! let printed = buffer.format(1.234);
+//! assert_eq!(printed, "1.234");
 //! ```
 //!
 //! ## Performance (lower is better)

src/s2d.rs

@@ -55,7 +55,7 @@ pub fn s2d(buffer: &[u8]) -> Result<f64, Error> {
         i += 1;
     }
 
-    if let Some(b'e') | Some(b'E') = buffer.get(i) {
+    if let Some(b'e' | b'E') = buffer.get(i) {
         e_index = i;
         i += 1;
         match buffer.get(i) {

src/s2f.rs

@@ -55,7 +55,7 @@ pub fn s2f(buffer: &[u8]) -> Result<f32, Error> {
         i += 1;
     }
 
-    if let Some(b'e') | Some(b'E') = buffer.get(i) {
+    if let Some(b'e' | b'E') = buffer.get(i) {
         e_index = i;
         i += 1;
         match buffer.get(i) {

tests/d2s_table_test.rs

@@ -47,13 +47,13 @@ use d2s_small_table::*;
 #[test]
 fn test_compute_pow5() {
     for (i, entry) in DOUBLE_POW5_SPLIT.iter().enumerate() {
-        assert_eq!(*entry, unsafe { compute_pow5(i as u32) }, "entry {}", i);
+        assert_eq!(*entry, unsafe { compute_pow5(i as u32) }, "entry {i}");
     }
 }
 
 #[test]
 fn test_compute_inv_pow5() {
     for (i, entry) in DOUBLE_POW5_INV_SPLIT[..292].iter().enumerate() {
-        assert_eq!(*entry, unsafe { compute_inv_pow5(i as u32) }, "entry {}", i);
+        assert_eq!(*entry, unsafe { compute_inv_pow5(i as u32) }, "entry {i}");
     }
 }