chore(canvas-native): format

Author: triniwiz

packages/canvas/src-native/canvas-native/canvas-core/Cargo.lock

@@ -24,7 +24,7 @@ lazy_static = "1.4.0"
 css-color-parser = "0.1.2"
 reqwest = { version = "0.11", features = ["blocking"] }
 openssl = { version = "0.10", features = ["vendored"] }
-phf = {version = "0.8.0", features = ["macros"]}
+phf = { version = "0.8.0", features = ["macros"] }
 rgb = "0.8.25"
 log = "0.4.8"
 stringreader = "0.1.1"

packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml

@@ -1,7 +1,7 @@
+use std::{env, fmt};
 use std::borrow::Borrow;
 use std::fmt::{Display, Formatter};
 use std::path::PathBuf;
-use std::{env, fmt};
 
 use bindgen;
 
@@ -88,7 +88,7 @@ fn main() {
             println!("cargo:rustc-link-search=native={}", include_dir);
             println!("cargo:rustc-link-lib=jnigraphics"); // the "-l" flag
             println!("cargo:rustc-link-lib=android"); // the "-l" flag
-                                                      // the resulting bindings.
+            // the resulting bindings.
             let bindings = bindgen::Builder::default()
                 // The input header we would like to generate
                 // bindings for.

packages/canvas/src-native/canvas-native/canvas-core/build.rs

@@ -1,14 +1,15 @@
 use std::str::FromStr;
 
 use jni::errors::Error;
+use jni::JNIEnv;
 use jni::objects::{JClass, JObject, JString, JValue, ReleaseMode};
 use jni::sys::{
-    jboolean, jbyteArray, jfloat, jfloatArray, jint, jlong, jobject, jstring, JNI_FALSE, JNI_TRUE,
+    jboolean, jbyteArray, jfloat, jfloatArray, jint, jlong, JNI_FALSE, JNI_TRUE, jobject, jstring,
 };
-use jni::JNIEnv;
 use skia_safe::Rect;
 
 use crate::common::context::compositing::composite_operation_type::CompositeOperationType;
+use crate::common::context::Context;
 use crate::common::context::drawing_paths::fill_rule::FillRule;
 use crate::common::context::fill_and_stroke_styles::paint::PaintStyle;
 use crate::common::context::fill_and_stroke_styles::pattern::Repetition;
@@ -22,7 +23,6 @@ use crate::common::context::pixel_manipulation::image_data::ImageData;
 use crate::common::context::text_styles::text_align::TextAlign;
 use crate::common::context::text_styles::text_baseline::TextBaseLine;
 use crate::common::context::text_styles::text_direction::TextDirection;
-use crate::common::context::Context;
 use crate::common::ffi::paint_style_value::{PaintStyleValue, PaintStyleValueType};
 use crate::common::utils::color::to_parsed_color;
 use crate::common::utils::image::{from_image_slice, from_image_slice_encoded, to_image};
@@ -121,14 +121,14 @@ fn get_style(env: JNIEnv, context: jlong, is_fill: bool) -> jobject {
             "(Ljava/lang/String;J)Lorg/json/JSONObject;",
             value_args.as_slice(),
         )
-        .unwrap();
+            .unwrap();
         env.call_method(
             json,
             "put",
             "(Ljava/lang/String;I)Lorg/json/JSONObject;",
             value_type_args.as_slice(),
         )
-        .unwrap();
+            .unwrap();
         json.into_inner()
     }
 }

packages/canvas/src-native/canvas-native/canvas-core/src/android/context.rs

@@ -1,4 +1,4 @@
 pub(crate) mod surface_texture;
-mod texture_render;
+pub mod texture_render;
 pub mod webgl2_rendering_context;
 pub mod webgl_rendering_context;

packages/canvas/src-native/canvas-native/canvas-core/src/android/gl/mod.rs

@@ -25,6 +25,7 @@ extern "system" {
     #[doc = " \\param st A ASurfaceTexture reference acquired with ASurfaceTexture_fromSurfaceTexture()"]
     pub fn ASurfaceTexture_release(st: *mut ASurfaceTexture);
 }
+
 extern "system" {
     #[doc = " Returns a reference to an ANativeWindow (i.e. the Producer) for this SurfaceTexture."]
     #[doc = " This is equivalent to Java's: Surface sur = new Surface(surfaceTexture);"]
@@ -37,6 +38,7 @@ extern "system" {
     #[doc = " returned if \\p st is null or if it's not an instance of android.graphics.SurfaceTexture"]
     pub fn ASurfaceTexture_acquireANativeWindow(st: *mut ASurfaceTexture) -> *mut ANativeWindow;
 }
+
 extern "system" {
     #[doc = " Attach the SurfaceTexture to the OpenGL ES context that is current on the calling thread.  A"]
     #[doc = " new OpenGL ES texture object is created and populated with the SurfaceTexture image frame"]
@@ -58,6 +60,7 @@ extern "system" {
         texName: u32,
     ) -> ::std::os::raw::c_int;
 }
+
 extern "system" {
     #[doc = " Detach the SurfaceTexture from the OpenGL ES context that owns the OpenGL ES texture object."]
     #[doc = " This call must be made with the OpenGL ES context current on the calling thread.  The OpenGL"]
@@ -75,6 +78,7 @@ extern "system" {
     #[doc = " \\return 0 on success, negative posix error code otherwise (see <errno.h>)"]
     pub fn ASurfaceTexture_detachFromGLContext(st: *mut ASurfaceTexture) -> ::std::os::raw::c_int;
 }
+
 extern "system" {
     #[doc = " Update the texture image to the most recent frame from the image stream.  This may only be"]
     #[doc = " called while the OpenGL ES context that owns the texture is current on the calling thread."]
@@ -86,6 +90,7 @@ extern "system" {
     #[doc = " \\return 0 on success, negative posix error code otherwise (see <errno.h>)"]
     pub fn ASurfaceTexture_updateTexImage(st: *mut ASurfaceTexture) -> ::std::os::raw::c_int;
 }
+
 extern "system" {
     #[doc = " Retrieve the 4x4 texture coordinate transform matrix associated with the texture image set by"]
     #[doc = " the most recent call to updateTexImage."]
@@ -105,6 +110,7 @@ extern "system" {
     #[doc = "     16 elements."]
     pub fn ASurfaceTexture_getTransformMatrix(st: *mut ASurfaceTexture, mtx: *mut f32);
 }
+
 extern "system" {
     #[doc = " Retrieve the timestamp associated with the texture image set by the most recent call to"]
     #[doc = " updateTexImage."]

packages/canvas/src-native/canvas-native/canvas-core/src/android/gl/surface_texture.rs

@@ -1,8 +1,8 @@
 use std::os::raw::c_void;
 
+use jni::JNIEnv;
 use jni::objects::{JClass, JObject, ReleaseMode};
 use jni::sys::{jboolean, jfloatArray, jint};
-use jni::JNIEnv;
 
 const SURFACE_TEXTURE_CLASS: &'static str = "android/graphics/SurfaceTexture";
 

packages/canvas/src-native/canvas-native/canvas-core/src/android/gl/texture_render.rs

@@ -4,12 +4,12 @@
 
 use std::os::raw::c_void;
 
+use jni::JNIEnv;
 use jni::objects::{JByteBuffer, JClass, JObject, ReleaseMode};
 use jni::sys::{
     jboolean, jbyteArray, jdouble, jdoubleArray, jfloatArray, jint, jintArray, jlong, jlongArray,
-    jshortArray, JNI_TRUE,
+    JNI_TRUE, jshortArray,
 };
-use jni::JNIEnv;
 
 use crate::common::context::image_asset::ImageAsset;
 

packages/canvas/src-native/canvas-native/canvas-core/src/android/gl/webgl2_rendering_context.rs

@@ -5,11 +5,11 @@
 use std::os::raw::c_void;
 
 use jni::errors::Error;
+use jni::JNIEnv;
 use jni::objects::{AutoPrimitiveArray, JByteBuffer, JClass, JObject, ReleaseMode};
 use jni::sys::{
-    jboolean, jbyteArray, jfloatArray, jint, jintArray, jlong, jobject, jshortArray, JNI_TRUE,
+    jboolean, jbyteArray, jfloatArray, jint, jintArray, jlong, JNI_TRUE, jobject, jshortArray,
 };
-use jni::JNIEnv;
 use skia_safe::RCHandle;
 
 use crate::common::context::image_asset::ImageAsset;

packages/canvas/src-native/canvas-native/canvas-core/src/android/gl/webgl_rendering_context.rs

@@ -1,8 +1,8 @@
 use std::ffi::CStr;
 use std::os::raw::{c_char, c_float, c_longlong};
 
-use jni::objects::{JClass, JString};
 use jni::JNIEnv;
+use jni::objects::{JClass, JString};
 
 use crate::common::context::fill_and_stroke_styles::paint::PaintStyle;