refactor:pass linter

Author: limuy2022

CONTRIBUTING.md

@@ -26,7 +26,7 @@ If you want to commit changes,please obey the following steps:
 
 ## Tests
 
-For your code,your should write necessary tests to cover your code in both GDScript and Rust.We use Github Action to run the tests
+For your code,you should write necessary tests to cover your code in both GDScript and Rust.We use Github Action to run the tests
 
 [Rust Test Guide](./docs/rust_test.md)
 

docs/rust_test.md

@@ -26,4 +26,4 @@ impl xxx {
 }
 ```
 
-Like this,the function marked by `#[debug]` will be ran in debug mode at the place of `debug_check!()` macro.
+Like this,the function marked by `#[debug]` will be running in debug mode at the place of `debug_check!()` macro.

gdrust/server/src/lib.rs

@@ -46,21 +46,21 @@ impl Connection {
             let sz = self.stream.read_buf(&mut self.buffer).await?;
             log::info!("Received:{}", sz);
             if 0 == sz {
-                if self.buffer.is_empty() {
+                return if self.buffer.is_empty() {
                     log::info!("Join exiting(empty)...");
-                    return Ok(None);
+                    Ok(None)
                 } else {
                     let msg = "Connection reset by peer";
                     log::info!("{}", msg);
-                    return Err(anyhow!(msg));
-                }
+                    Err(anyhow!(msg))
+                };
             }
         }
     }
 
     pub fn parse_join(&mut self) -> anyhow::Result<Option<Join>> {
         let buf = Cursor::new(&self.buffer[..]);
-        match proto::connect::Join::decode(buf) {
+        match Join::decode(buf) {
             Ok(val) => Ok(Some(val)),
             Err(_) => Err(anyhow!("Not a join message")),
         }
@@ -74,13 +74,13 @@ impl Connection {
             if let Some(request) = self.parse_request()? {}
             let sz = self.stream.read_buf(&mut self.buffer).await?;
             if 0 == sz {
-                if self.buffer.is_empty() {
-                    return Ok(());
+                return if self.buffer.is_empty() {
+                    Ok(())
                 } else {
                     let msg = "Connection reset by peer";
                     log::info!("{}", msg);
-                    return Err(anyhow!(msg));
-                }
+                    Err(anyhow!(msg))
+                };
             }
         }
     }

gdrust/src/bullets/star_wrath_bullet.rs

@@ -1,4 +1,4 @@
-use godot::engine::{Area2D, IArea2D};
+use godot::classes::{Area2D, IArea2D};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 use rand::{thread_rng, Rng};
@@ -47,7 +47,7 @@ impl StarWrathBullet {
     }
 
     fn random_speed(&mut self) {
-        self.speed = rand::thread_rng().gen_range(SPEED_MIN..=SPEED_MAX);
+        self.speed = thread_rng().gen_range(SPEED_MIN..=SPEED_MAX);
     }
 
     fn base_init(&mut self, rad: f32) {

gdrust/src/fight.rs

@@ -1,5 +1,5 @@
 use crate::debug_check;
-use godot::engine::{Control, IControl, Sprite2D, Timer};
+use godot::classes::{Control, IControl, Sprite2D, Timer};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 use rand::Rng;

gdrust/src/fight_items/bar.rs

@@ -1,4 +1,4 @@
-use godot::engine::{Control, IControl};
+use godot::classes::{Control, IControl};
 use godot::prelude::*;
 
 #[derive(GodotClass)]

gdrust/src/fight_items/block_drawer.rs

@@ -1,4 +1,4 @@
-use godot::engine::{Area2D, CollisionPolygon2D, INode2D, Node2D, StaticBody2D};
+use godot::classes::{Area2D, CollisionPolygon2D, INode2D, Node2D, StaticBody2D};
 use godot::obj::{NewAlloc, WithBaseField};
 use godot::prelude::*;
 

gdrust/src/fight_items/health_bar.rs

@@ -1,4 +1,4 @@
-use godot::engine::{INode2D, Node2D};
+use godot::classes::{INode2D, Node2D};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 

gdrust/src/global.rs

@@ -1,5 +1,5 @@
 use crate::multi::MultiManager;
-use godot::engine::{INode, Node};
+use godot::classes::{INode, Node};
 use godot::prelude::*;
 
 #[derive(GodotClass)]

gdrust/src/lib.rs

@@ -13,7 +13,7 @@ mod zenith;
 use godot::prelude::*;
 use multi::{MultiManager, MultiManagerImpl};
 use std::{
-    panic::{set_hook, PanicInfo},
+    panic::{set_hook, PanicHookInfo},
     sync::{Arc, Mutex, OnceLock},
 };
 use tokio::runtime::{Builder, Runtime};
@@ -31,7 +31,7 @@ fn get_tokio_runtime() -> &'static Runtime {
     TMP.get_or_init(|| Builder::new_multi_thread().enable_all().build().unwrap())
 }
 
-fn panic_handler(info: &PanicInfo) {
+fn panic_handler(info: &PanicHookInfo) {
     if let Some(p) = info.location() {
         godot_error!(
             "Panic occurred in file '{}' at line {}\n",

gdrust/src/multi.rs

@@ -1,11 +1,10 @@
 use ::proto::ProtoRequest;
 use anyhow::anyhow;
 use bytes::{Bytes, BytesMut};
-use godot::engine::{INode, Node};
+use godot::classes::{INode, Node};
 use godot::prelude::*;
 use prost::Message;
 use proto::connect::Join;
-use proto::proto;
 use std::collections::HashMap;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf};
@@ -26,7 +25,7 @@ enum Requests {
 
 pub struct MultiManagerImpl {
     clients: HashMap<usize, MultiPlayerConnection>,
-    socket: Option<mpsc::Sender<bytes::Bytes>>,
+    socket: Option<mpsc::Sender<Bytes>>,
     receiver: Option<std::sync::mpsc::Receiver<Requests>>,
 }
 
@@ -75,7 +74,7 @@ async fn read_loop(
 }
 
 fn parse_request(buf: &BytesMut) -> Option<Requests> {
-    match proto::connect::Join::decode(&buf[..]) {
+    match Join::decode(&buf[..]) {
         Ok(v) => Some(Requests::Proto(ProtoRequest::Join(v))),
         Err(_) => None,
     }
@@ -114,7 +113,7 @@ impl MultiManagerImpl {
             player_name,
             version: base::build::COMMIT_HASH.to_string(),
         };
-        let mut buf = bytes::BytesMut::new();
+        let mut buf = BytesMut::new();
         data.encode(&mut buf)?;
         let sender = socket.clone();
         get_tokio_runtime().spawn(send(sender, buf));

gdrust/src/player.rs

@@ -1,7 +1,6 @@
 use core::panic;
 use derive::gen_debug;
-use godot::engine::{Area2D, CharacterBody2D, GpuParticles2D, ICharacterBody2D, Timer};
-use godot::global::abs;
+use godot::classes::{Area2D, CharacterBody2D, GpuParticles2D, ICharacterBody2D, Timer};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 use real_consts::PI;

gdrust/src/ui/multi_enter.rs

@@ -1,6 +1,6 @@
 use crate::{debug_check, get_multi_single};
 use derive::gen_debug;
-use godot::engine::{AcceptDialog, Button, IButton};
+use godot::classes::{AcceptDialog, Button, IButton};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 use std::net::TcpStream;

gdrust/src/weapons.rs

@@ -1,3 +1,2 @@
 mod enchanted_sword;
 mod star_wrath;
-

gdrust/src/weapons/enchanted_sword.rs

@@ -1,5 +1,5 @@
 use godot::{
-    engine::{ISprite2D, Sprite2D},
+    classes::{ISprite2D, Sprite2D},
     prelude::*,
 };
 use std::collections::HashMap;

gdrust/src/weapons/star_wrath.rs

@@ -1,6 +1,6 @@
 use crate::bullets::star_wrath_bullet::StarWrathBullet;
 use crate::debug_check;
-use godot::engine::{AnimationPlayer, AnimationTree, Area2D, IArea2D, Timer};
+use godot::classes::{AnimationTree, Area2D, IArea2D, Timer};
 use godot::obj::WithBaseField;
 use godot::prelude::*;
 

gdrust/src/zenith.rs

@@ -1,4 +1,4 @@
-use godot::engine::{Area2D, IArea2D};
+use godot::classes::{Area2D, IArea2D};
 use godot::prelude::*;
 
 #[derive(GodotClass)]