build: migrate to stable rust

Brooooooklyn · Nov 15, 2024 · df7e021 · df7e021
1 parent a94a2ad
commit df7e021
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 49 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow       = "1"
-base64       = "0.22"
 base64-simd  = "0.8"
 cssparser    = "0.29"
 infer        = "0.16"

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-09-04"
+channel = "1.82.0"
 profile = "default"
diff --git a/src/image.rs b/src/image.rs
@@ -229,9 +229,12 @@ impl Image {
 
   #[napi(setter)]
   pub fn set_src(&mut self, env: Env, this: This, data: Either<Uint8Array, String>) -> Result<()> {
-    if let Either::A(d) = &data
-      && d.len() <= 2
-    {
+    let data_is_too_small = if let Either::A(d) = &data {
+      d.len() <= 2
+    } else {
+      false
+    };
+    if data_is_too_small {
       self.src = Some(data);
       self.width = -1.0;
       self.height = -1.0;
@@ -389,9 +392,11 @@ impl Task for BitmapDecoder {
       } else {
         DecodeStatus::Empty
       }
-    } else if let Some(kind) = infer::get(&data_ref)
-      && kind.matcher_type() == infer::MatcherType::Image
-    {
+    } else if if let Some(kind) = infer::get(&data_ref) {
+      kind.matcher_type() == infer::MatcherType::Image
+    } else {
+      false
+    } {
       DecodeStatus::Ok(BitmapInfo {
         data: Bitmap::from_buffer(data_ref.as_ptr().cast_mut(), length),
         is_svg: false,

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(link_cfg)]
-#![feature(let_chains)]
 #![deny(clippy::all)]
 #![allow(clippy::many_single_char_names)]
 #![allow(clippy::too_many_arguments)]
@@ -13,7 +11,6 @@ extern crate serde_derive;
 use std::str::FromStr;
 use std::{mem, slice};
 
-use base64::Engine;
 use bindgen_prelude::{BufferSlice, JavaScriptClassExt};
 use napi::bindgen_prelude::{AsyncTask, ClassInstance, Either3, This, Unknown};
 use napi::*;
@@ -399,10 +396,10 @@ impl Task for AsyncDataUrl {
     let mut output = format!("data:{};base64,", &self.mime);
     match &self.surface_data {
       ContextOutputData::Skia(data_ref) => {
-        base64::engine::general_purpose::STANDARD.encode_string(data_ref.slice(), &mut output);
+        base64_simd::STANDARD.encode_append(data_ref.slice(), &mut output);
       }
       ContextOutputData::Avif(data_ref) => {
-        base64::engine::general_purpose::STANDARD.encode_string(data_ref.as_ref(), &mut output);
+        base64_simd::STANDARD.encode_append(data_ref.as_ref(), &mut output);
       }
     }
     Ok(output)

diff --git a/src/sk.rs b/src/sk.rs
@@ -224,48 +224,48 @@ pub mod ffi {
 
   #[allow(clippy::duplicated_attributes)]
   // https://github.com/rust-lang/rust/issues/96192
-  #[link(
-    name = "svg",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(name = "svg", kind = "static", modifiers = "+bundle,+whole-archive",)
   )]
-  #[link(name = "svg", kind = "static", cfg(target_os = "windows"))]
-  #[link(
-    name = "skparagraph",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(target_os = "windows", link(name = "svg", kind = "static"))]
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(
+      name = "skparagraph",
+      kind = "static",
+      modifiers = "+bundle,+whole-archive"
+    )
   )]
-  #[link(name = "skparagraph", kind = "static", cfg(target_os = "windows"))]
-  #[link(
-    name = "skunicode_core",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(target_os = "windows", link(name = "skparagraph", kind = "static"))]
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(
+      name = "skunicode_core",
+      kind = "static",
+      modifiers = "+bundle,+whole-archive",
+    )
   )]
-  #[link(name = "skunicode_core", kind = "static", cfg(target_os = "windows"))]
-  #[link(
-    name = "skunicode_icu",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(target_os = "windows", link(name = "skunicode_core", kind = "static"))]
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(
+      name = "skunicode_icu",
+      kind = "static",
+      modifiers = "+bundle,+whole-archive"
+    )
   )]
-  #[link(name = "skunicode_icu", kind = "static", cfg(target_os = "windows"))]
-  #[link(
-    name = "skia",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(target_os = "windows", link(name = "skunicode_icu", kind = "static"))]
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(name = "skia", kind = "static", modifiers = "+bundle,+whole-archive")
   )]
-  #[link(name = "skia", kind = "static", cfg(target_os = "windows"))]
-  #[link(
-    name = "skiac",
-    kind = "static",
-    modifiers = "+bundle,+whole-archive",
-    cfg(not(target_os = "windows"))
+  #[cfg_attr(target_os = "windows", link(name = "skia", kind = "static"))]
+  #[cfg_attr(
+    not(target_os = "windows"),
+    link(name = "skiac", kind = "static", modifiers = "+bundle,+whole-archive")
   )]
-  #[link(name = "skiac", kind = "static", cfg(target_os = "windows"))]
+  #[cfg_attr(target_os = "windows", link(name = "skiac", kind = "static"))]
   extern "C" {
 
     pub fn skiac_clear_all_cache();