Run Rustfmt

Author: Omico

.rustfmt.toml

@@ -0,0 +1 @@
+match_block_trailing_comma = true

Cargo.lock

@@ -1,7 +1,7 @@
-use regex::Regex;
-use std::hash::{Hash, Hasher};
 use edit_distance;
 use log::error;
+use regex::Regex;
+use std::hash::{Hash, Hasher};
 use strum_macros::Display;
 
 #[derive(Debug, Hash, Clone, PartialEq, Eq)]
@@ -36,8 +36,7 @@ pub enum ArtifactSlot {
     Head,
 }
 
-#[derive(Debug, Hash, Clone, PartialEq, Eq)]
-#[derive(Display)]
+#[derive(Debug, Hash, Clone, PartialEq, Eq, Display)]
 pub enum ArtifactSetName {
     ArchaicPetra,
     HeartOfDepth,
@@ -130,6 +129,7 @@ impl PartialEq for ArtifactStat {
 impl Eq for ArtifactStat {}
 
 impl ArtifactStatName {
+    #[rustfmt::skip]
     pub fn from_zh_cn(name: &str, is_percentage: bool) -> Option<ArtifactStatName> {
         match name {
             "治疗加成" => Some(ArtifactStatName::HealingBonus),
@@ -187,6 +187,7 @@ impl ArtifactStat {
 }
 
 pub fn get_real_artifact_name_chs(raw: &str) -> Option<String> {
+    #[rustfmt::skip]
     let all_artifact_chs = [
         "磐陀裂生之花", "嵯峨群峰之翼", "星罗圭壁之晷", "星罗圭璧之晷", "巉岩琢塑之樽", "不动玄石之相",
         "历经风雪的思念", "摧冰而行的执望", "冰雪故园的终期", "遍结寒霜的傲骨", "破冰踏雪的回音",
@@ -254,6 +255,7 @@ pub fn get_real_artifact_name_chs(raw: &str) -> Option<String> {
 }
 
 impl ArtifactSetName {
+    #[rustfmt::skip]
     pub fn from_zh_cn(s: &str) -> Option<ArtifactSetName> {
         // let s = match get_real_artifact_name_chs(s) {
         //     Some(v) => v,
@@ -668,4 +670,3 @@ impl ArtifactSlot {
         }
     }
 }
-

src/artifact/internal_artifact.rs

@@ -1 +1 @@
-pub mod internal_artifact;
+pub mod internal_artifact;

src/artifact/mod.rs

@@ -1,7 +1,10 @@
 #[cfg(target_os = "macos")]
-use std::{os::macos::raw};
+use std::os::macos::raw;
 
-use image::{Rgb, RgbImage, ImageBuffer, RgbaImage, buffer::ConvertBuffer, imageops::resize, imageops::FilterType::Triangle};
+use image::{
+    buffer::ConvertBuffer, imageops::resize, imageops::FilterType::Triangle, ImageBuffer, Rgb,
+    RgbImage, RgbaImage,
+};
 
 use crate::common::color::Color;
 use crate::common::PixelRect;
@@ -23,21 +26,24 @@ pub fn capture_absolute(
         .capture_area(*left, *top, *width as u32, *height as u32)
         .expect("capture failed");
     let mut rgb_img = png_decode(png_img).unwrap();
-    if rgb_img.width() as i32> *width && rgb_img.height() as i32> *height {
+    if rgb_img.width() as i32 > *width && rgb_img.height() as i32 > *height {
         rgb_img = resize(&rgb_img, (*width) as u32, (*height) as u32, Triangle);
     }
     Ok(rgb_img)
 }
 
-fn png_decode(png_img:screenshots::Image) -> Result<RgbImage, String>  {
+fn png_decode(png_img: screenshots::Image) -> Result<RgbImage, String> {
     let png_decoder = Decoder::new(png_img.buffer().as_slice());
     let mut png_reader = png_decoder.read_info().unwrap();
 
     let mut png_data_buf = vec![0; png_reader.output_buffer_size()];
 
     let info = png_reader.next_frame(&mut png_data_buf).unwrap();
-    
-    assert!(info.color_type == png::ColorType::Rgba, "Not rgba format image");
+
+    assert!(
+        info.color_type == png::ColorType::Rgba,
+        "Not rgba format image"
+    );
 
     let mut buffer = png_data_buf[..info.buffer_size()].to_vec();
 
@@ -63,7 +69,7 @@ pub fn capture_absolute_image(
 
     let mut buffer = png_decode(image).unwrap();
 
-    if buffer.width() as i32> *width && buffer.height() as i32> *height {
+    if buffer.width() as i32 > *width && buffer.height() as i32 > *height {
         buffer = resize(&buffer, (*width) as u32, (*height) as u32, Triangle);
     }
     Ok(buffer)

src/capture/mod.rs

@@ -1,11 +1,11 @@
 pub struct Buffer {
-    pub data: Vec<Vec<f32>>
+    pub data: Vec<Vec<f32>>,
 }
 
 impl Buffer {
     fn new_zeroed(width: usize, height: usize) -> Buffer {
         Buffer {
-            data: vec![vec![0.0; width]; height]
+            data: vec![vec![0.0; width]; height],
         }
     }
-}
+}

src/common/buffer.rs

@@ -76,4 +76,4 @@ lazy_static! {
 
         set
     };
-}
+}

src/common/character_name.rs

@@ -1,5 +1,5 @@
 #[derive(Debug)]
-pub struct Color (pub u8, pub u8, pub u8);
+pub struct Color(pub u8, pub u8, pub u8);
 
 impl Color {
     pub fn is_same(&self, other: &Color) -> bool {
@@ -11,8 +11,7 @@ impl Color {
     pub fn dis_2(&self, other: &Color) -> u32 {
         let dis = (self.0 as i32 - other.0 as i32) * (self.0 as i32 - other.0 as i32)
             + (self.1 as i32 - other.1 as i32) * (self.1 as i32 - other.1 as i32)
-            + (self.2 as i32 - other.2 as i32) * (self.2 as i32 - other.2 as i32)
-            ;
+            + (self.2 as i32 - other.2 as i32) * (self.2 as i32 - other.2 as i32);
         dis as u32
     }
 
@@ -23,4 +22,4 @@ impl Color {
     pub fn from(r: u8, g: u8, b: u8) -> Color {
         Color(r, g, b)
     }
-}
+}

src/common/color.rs

@@ -21,7 +21,6 @@ pub fn mac_scroll(enigo: &mut Enigo, count: i32) {
     }
 }
 
-
 pub fn get_titlebar_height() -> f64 {
     use cocoa::appkit::{NSBackingStoreBuffered, NSImage, NSWindow, NSWindowStyleMask};
     use cocoa::base::nil;

src/common/utils/mac.rs

@@ -2,6 +2,5 @@ use serde::Deserialize;
 
 #[derive(Deserialize)]
 pub struct GithubTag {
-    pub name: String
+    pub name: String,
 }
-