fix [skip skia]

Brooooooklyn · Jun 8, 2024 · f313c3f · f313c3f
1 parent c6af883
commit f313c3f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "link-args=/NODEFAULTLIB:libcmt.lib", "-C", "target-feature=+crt-static"]
+rustflags = ["-C", "target-feature=+crt-static"]
 
 [target.aarch64-apple-darwin]
 rustflags = ["-C", "target-cpu=apple-a14"]

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -77,6 +77,8 @@ jobs:
               yarn build --target x86_64-apple-darwin
             downloadTarget: ''
           - host: windows-latest
+            setup: |
+              choco upgrade llvm
             build: yarn build --target x86_64-pc-windows-msvc
             target: 'x86_64-pc-windows-msvc'
             downloadTarget: ''
@@ -150,7 +152,7 @@ jobs:
               export LDFLAGS="--target=aarch64-linux-android24"
               yarn build --target aarch64-linux-android
 
-    name: stable - ${{ matrix.settings.target }} - node@18
+    name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
 
     steps:

diff --git a/src/filter.rs b/src/filter.rs
@@ -312,7 +312,7 @@ pub(crate) fn css_filters_to_image_filter(filters: Vec<CssFilter>) -> Option<Ima
         )
       }
       CssFilter::Grayscale(amt) => {
-        let amt = 1.0 - amt.max(0.0).min(1.0);
+        let amt = 1.0 - amt.clamp(0.0, 1.0);
         ImageFilter::make_image_filter(
           0.2126 + 0.7874 * amt,
           0.7152 - 0.7152 * amt,
@@ -345,7 +345,7 @@ pub(crate) fn css_filters_to_image_filter(filters: Vec<CssFilter>) -> Option<Ima
         )
       }
       CssFilter::Invert(amt) => {
-        let amt = amt.max(0.0).min(1.0);
+        let amt = amt.clamp(0.0, 1.0);
         let mut ramp = [0u8; 256];
         ramp
           .iter_mut()
@@ -360,7 +360,7 @@ pub(crate) fn css_filters_to_image_filter(filters: Vec<CssFilter>) -> Option<Ima
         ImageFilter::from_argb(None, ramp, ramp, ramp, Some(&image_filter))
       }
       CssFilter::Opacity(opacity) => {
-        let opacity = opacity.max(0.0).min(1.0);
+        let opacity = opacity.clamp(0.0, 1.0);
         ImageFilter::make_image_filter(
           1.0,
           0.0,
@@ -392,7 +392,7 @@ pub(crate) fn css_filters_to_image_filter(filters: Vec<CssFilter>) -> Option<Ima
         )
       }
       CssFilter::Sepia(amt) => {
-        let amt = 1.0 - amt.max(0.0).min(1.0);
+        let amt = 1.0 - amt.clamp(0.0, 1.0);
         ImageFilter::make_image_filter(
           0.393 + 0.607 * amt,
           0.769 - 0.769 * amt,

diff --git a/src/pattern.rs b/src/pattern.rs
@@ -12,6 +12,7 @@ use crate::{CanvasElement, SVGCanvas};
 
 #[derive(Debug, Clone)]
 pub enum Pattern {
+  #[allow(dead_code)]
   Color(RGBA, String),
   Gradient(Gradient),
   Image(ImagePattern),

diff --git a/src/sk.rs b/src/sk.rs
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 use std::f32::consts::PI;
 use std::ffi::{c_void, CStr, CString, NulError};
-use std::fmt;
+use std::fmt::{self, Display};
 use std::ops::{Deref, DerefMut};
 use std::os::raw::c_char;
 use std::ptr;
@@ -222,6 +222,7 @@ pub mod ffi {
   pub type SkiacFontCollectionGetFamily =
     Option<unsafe extern "C" fn(width: i32, weight: i32, slant: i32, raw_cb: *mut c_void)>;
 
+  #[allow(clippy::duplicated_attributes)]
   // https://github.com/rust-lang/rust/issues/96192
   #[link(
     name = "svg",
@@ -1480,9 +1481,9 @@ impl TextBaseline {
   }
 }
 
-impl ToString for TextBaseline {
-  fn to_string(&self) -> String {
-    self.as_str().to_owned()
+impl Display for TextBaseline {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    write!(f, "{}", self.as_str())
   }
 }