feat: upgrade to Rust 1.86.0

Pathfinder 0.5.5 has finally resolved the compilation errors encountered when upgrading to the new version of Rust.

See also: servo/pathfinder#571

Author: yisibl

.github/workflows/CI.yaml

@@ -114,11 +114,18 @@ jobs:
         with:
           node-version: 18
           cache: yarn
-      - name: Install
-        uses: dtolnay/rust-toolchain@master
+      - name: Rustup toolchain version
+        shell: bash
+        id: rustup-version
+        run: |
+          export RUST_TOOLCHAIN_VERSION="$(grep 'channel' rust-toolchain.toml | head -1 | awk -F '"' '{print $2}')"
+          echo "Rust toolchain version: $RUST_TOOLCHAIN_VERSION"
+          echo "RUST_TOOLCHAIN_VERSION=$RUST_TOOLCHAIN_VERSION" >> "$GITHUB_OUTPUT"
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
         if: ${{ !matrix.settings.docker }}
         with:
-          toolchain: nightly-2023-12-11
+          toolchain: ${{ steps.rustup-version.outputs.RUST_TOOLCHAIN_VERSION }}
           targets: ${{ matrix.settings.target }}
       - name: Cache cargo
         uses: actions/cache@v4
@@ -191,11 +198,20 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - name: Install
-        uses: actions-rs/toolchain@v1
+      - name: Rustup toolchain version
+        shell: bash
+        id: rustup-version
+        run: |
+          export RUST_TOOLCHAIN_VERSION="$(grep 'channel' rust-toolchain.toml | head -1 | awk -F '"' '{print $2}')"
+          echo "Rust toolchain version: $RUST_TOOLCHAIN_VERSION"
+          echo "RUST_TOOLCHAIN_VERSION=$RUST_TOOLCHAIN_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        if: ${{ !matrix.settings.docker }}
         with:
-          profile: minimal
-          override: true
+          toolchain: ${{ steps.rustup-version.outputs.RUST_TOOLCHAIN_VERSION }}
+          targets: ${{ matrix.settings.target }}
 
       - name: Cache cargo
         uses: Swatinem/rust-cache@v2

Cargo.toml

@@ -19,7 +19,7 @@ thiserror = "1.0.37"
 png = "=0.17.5"
 pathfinder_geometry = "0.5.1"
 pathfinder_content = { version = "0.5.0", default-features = false }
-pathfinder_simd = { version = "=0.5.2", features = ["pf-no-simd"] }
+pathfinder_simd = { version = "=0.5.5", features = ["pf-no-simd"] }
 futures = "0.3.21"
 woff2 = "0.3.0"
 
@@ -38,8 +38,8 @@ resvg = { version = "0.34.0", default-features = false, features = [
 ] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-napi = { version = "2.16.0", features = ["serde-json", "async"] }
-napi-derive = "2.16.0"
+napi = { version = "2.16.17", features = ["serde-json", "async"] }
+napi-derive = "2.16.13"
 resvg = { version = "0.34.0", default-features = false, features = [
     "raster-images",
     "text",

js-binding.d.ts

@@ -3,7 +3,7 @@
 
 /* auto-generated by NAPI-RS */
 
-export function renderAsync(svg: string | Buffer, options?: string | undefined | null, signal?: AbortSignal | undefined | null): Promise<RenderedImage>
+export declare function renderAsync(svg: string | Buffer, options?: string | undefined | null, signal?: AbortSignal | undefined | null): Promise<RenderedImage>
 export declare class BBox {
   x: number
   y: number

rust-toolchain

@@ -0,0 +1,4 @@
+# Use `rustup show` to view the currently installed version.
+[toolchain]
+channel = "1.86.0"
+profile = "default"

rust-toolchain.toml

@@ -31,8 +31,7 @@ var heap = new Array(128).fill(void 0);
 heap.push(void 0, null, true, false);
 var heap_next = heap.length;
 function addHeapObject(obj) {
-  if (heap_next === heap.length)
-    heap.push(heap.length + 1);
+  if (heap_next === heap.length) heap.push(heap.length + 1);
   const idx = heap_next;
   heap_next = heap[idx];
   heap[idx] = obj;
@@ -42,8 +41,7 @@ function getObject(idx) {
   return heap[idx];
 }
 function dropObject(idx) {
-  if (idx < 132)
-    return;
+  if (idx < 132) return;
   heap[idx] = heap_next;
   heap_next = idx;
 }
@@ -87,8 +85,7 @@ function passStringToWasm0(arg, malloc, realloc) {
   let offset = 0;
   for (; offset < len; offset++) {
     const code = arg.charCodeAt(offset);
-    if (code > 127)
-      break;
+    if (code > 127) break;
     mem[ptr + offset] = code;
   }
   if (offset !== len) {
@@ -555,8 +552,7 @@ function __wbg_finalize_init(instance, module2) {
   return wasm;
 }
 async function __wbg_init(input) {
-  if (wasm !== void 0)
-    return wasm;
+  if (wasm !== void 0) return wasm;
   if (typeof input === "undefined") {
     input = new URL("index_bg.wasm", void 0);
   }
@@ -585,8 +581,7 @@ var Resvg2 = class extends Resvg {
    * @param {ResvgRenderOptions | undefined} options
    */
   constructor(svg, options) {
-    if (!initialized)
-      throw new Error("Wasm has not been initialized. Call `initWasm()` function.");
+    if (!initialized) throw new Error("Wasm has not been initialized. Call `initWasm()` function.");
     const font = options?.font;
     if (!!font && isCustomFontsOptions(font)) {
       const serializableOptions = {

wasm/index.js

@@ -4,8 +4,7 @@ var heap = new Array(128).fill(void 0);
 heap.push(void 0, null, true, false);
 var heap_next = heap.length;
 function addHeapObject(obj) {
-  if (heap_next === heap.length)
-    heap.push(heap.length + 1);
+  if (heap_next === heap.length) heap.push(heap.length + 1);
   const idx = heap_next;
   heap_next = heap[idx];
   heap[idx] = obj;
@@ -15,8 +14,7 @@ function getObject(idx) {
   return heap[idx];
 }
 function dropObject(idx) {
-  if (idx < 132)
-    return;
+  if (idx < 132) return;
   heap[idx] = heap_next;
   heap_next = idx;
 }
@@ -60,8 +58,7 @@ function passStringToWasm0(arg, malloc, realloc) {
   let offset = 0;
   for (; offset < len; offset++) {
     const code = arg.charCodeAt(offset);
-    if (code > 127)
-      break;
+    if (code > 127) break;
     mem[ptr + offset] = code;
   }
   if (offset !== len) {
@@ -528,8 +525,7 @@ function __wbg_finalize_init(instance, module) {
   return wasm;
 }
 async function __wbg_init(input) {
-  if (wasm !== void 0)
-    return wasm;
+  if (wasm !== void 0) return wasm;
   if (typeof input === "undefined") {
     input = new URL("index_bg.wasm", void 0);
   }
@@ -558,8 +554,7 @@ var Resvg2 = class extends Resvg {
    * @param {ResvgRenderOptions | undefined} options
    */
   constructor(svg, options) {
-    if (!initialized)
-      throw new Error("Wasm has not been initialized. Call `initWasm()` function.");
+    if (!initialized) throw new Error("Wasm has not been initialized. Call `initWasm()` function.");
     const font = options?.font;
     if (!!font && isCustomFontsOptions(font)) {
       const serializableOptions = {