解决了应该修复的warning，禁用了不必要的warning

juzi5201314 · juzi5201314 · commit b65d911c7d86 · 2019-12-03T22:37:27.000+08:00
diff --git a/src/cqp.rs b/src/cqp.rs
@@ -1,14 +1,12 @@
-#![allow(non_snake_case)]
-
 use std::os::raw::c_char;
 
 pub static EVENT_IGNORE: i32 = 0; //事件_忽略
 pub static EVENT_BLOCK: i32 = 1; //事件_拦截
 
-pub static REQUEST_ALLOW: i32 = 1; //请求_通过
+/*pub static REQUEST_ALLOW: i32 = 1; //请求_通过
 pub static REQUEST_DENY: i32 = 2; //请求_拒绝
 pub static REQUEST_GROUPADD: i32 = 1; //请求_群添加
-pub static REQUEST_GROUPINVITE: i32 = 2; //请求_群邀请
+pub static REQUEST_GROUPINVITE: i32 = 2; //请求_群邀请*/
 
 pub static CQLOG_DEBUG: i32 = 0; //调试 灰色
 pub static CQLOG_INFO: i32 = 10; //信息 黑色
diff --git a/src/events/discuss_message.rs b/src/events/discuss_message.rs
@@ -12,7 +12,7 @@ pub struct DiscussMessageEvent {
 }
 
 impl DiscussMessageEvent {
-    fn get_user() {}
+    pub fn get_user() {}
     //fn get_discuss() {} qq已经放弃讨论组，所以讨论组方面的东西就不写了。
 }
 
diff --git a/src/events/group_ban.rs b/src/events/group_ban.rs
@@ -1,6 +1,5 @@
 use super::{Event, Events};
 use crate::qqtargets::{Group, User};
-use crate::api::{set_group_ban, set_group_whole_ban};
 
 #[derive(Debug)]
 pub struct GroupBanEvent {
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,9 @@
+#![allow(unused_attributes)]
+#![allow(non_upper_case_globals)]
 #![allow(dead_code)]
+#![allow(non_snake_case)]
+#![allow(non_camel_case_types)]
+#![allow(unused_unsafe)]
 
 #[macro_use]
 extern crate lazy_static;
@@ -7,7 +12,6 @@ use std::ffi::{CString, CStr};
 use encoding::{EncoderTrap, DecoderTrap, Encoding};
 use encoding::all::GB18030;
 
-use std::mem;
 use std::os::raw::c_char;
 
 use events::*;
@@ -20,35 +24,27 @@ mod listener;
 
 pub use listener::register_listener;
 
-use std::cell::RefCell;
-use crate::api::{add_log, CQLogLevel, Flag, get_group_list, send_private_msg, get_stranger_info};
+use crate::api::Flag;
 use crate::qqtargets::{User, Group, File};
-use std::mem::size_of_val;
-use std::path::Prefix::DeviceNS;
-
 
 pub mod qqtargets;
 
 #[macro_export]
 macro_rules! gb18030 {
     ($e:expr) => {
-        unsafe {
             CString::new(GB18030.encode($e, EncoderTrap::Ignore).unwrap())
                 .unwrap()
                 .into_raw()
-        }
     };
 }
 
 #[macro_export]
 macro_rules! utf8 {
     ($e:expr) => {
-        unsafe {
             GB18030
                 .decode(CStr::from_ptr($e).to_bytes(), DecoderTrap::Ignore)
                 .unwrap()[..]
                 .to_string()
-        }
     };
 }
 
@@ -114,7 +110,7 @@ pub extern "stdcall" fn on_private_msg(
             canceld: false,
             sub_type: sub_type,
             msg_id: msg_id,
-            msg: utf8!(msg),
+            msg: unsafe { utf8!(msg) },
             font: font,
             user: User::new(user_id),
         },
@@ -137,11 +133,11 @@ pub extern "stdcall" fn on_group_msg(
             canceld: false,
             sub_type: sub_type,
             msg_id: msg_id,
-            anonymous_flag: utf8!(anonymous_flag),
-            msg: utf8!(msg),
+            anonymous_flag: unsafe { utf8!(anonymous_flag) },
+            msg: unsafe { utf8!(msg) },
             font: font,
             group: Group::new(group_id),
-            user: User::new(user_id)
+            user: User::new(user_id),
         },
     )
 }
@@ -163,7 +159,7 @@ pub extern "stdcall" fn on_discuss_msg(
             msg_id: msg_id,
             discuss_id: discuss_id,
             user_id: user_id,
-            msg: utf8!(msg),
+            msg: unsafe { utf8!(msg) },
             font: font,
         },
     )
@@ -177,7 +173,7 @@ pub extern "stdcall" fn on_group_upload(sub_type: i32, send_time: i32, group_id:
         group_id: group_id,
         user_id: user_id,
         send_time: send_time,
-        file: File::decode(utf8!(file).as_bytes().to_vec()),
+        file: File::decode(unsafe { utf8!(file).as_bytes().to_vec() }),
     })
 }
 
@@ -188,7 +184,7 @@ pub extern "stdcall" fn on_group_admin(sub_type: i32, send_time: i32, group_id:
         sub_type: sub_type,
         send_time: send_time,
         group: Group::new(group_id),
-        user: User::new(user_id)
+        user: User::new(user_id),
     })
 }
 
@@ -201,7 +197,7 @@ pub extern "stdcall" fn on_group_member_decrease(sub_type: i32, send_time: i32,
         group: Group::new(group_id),
         operate_user: if sub_type == 1 { being_operate_user.clone() } else { User::new(operate_user_id) },
         send_time: send_time,
-        being_operate_user: being_operate_user
+        being_operate_user: being_operate_user,
     })
 }
 
@@ -213,7 +209,7 @@ pub extern "stdcall" fn on_group_member_increase(sub_type: i32, send_time: i32,
         group: Group::new(group_id),
         operate_user: User::new(operate_user_id),
         send_time: send_time,
-        being_operate_user: User::new(being_operate_user_id)
+        being_operate_user: User::new(being_operate_user_id),
     })
 }
 
@@ -226,7 +222,7 @@ pub extern "stdcall" fn on_group_ban(sub_type: i32, send_time: i32, group_id: i6
         send_time: send_time,
         being_operate_user: User::new(being_operate_user_id),
         time: time,
-        group: Group::new(group_id)
+        group: Group::new(group_id),
     })
 }
 
@@ -246,9 +242,9 @@ pub extern "stdcall" fn on_add_friend_request(sub_type: i32, send_time: i32, use
         canceld: false,
         sub_type: sub_type,
         send_time: send_time,
-        msg: utf8!(msg),
-        flag: Flag::from(utf8!(flag)),
-        user: User::new(user_id)
+        msg: unsafe { utf8!(msg) },
+        flag: Flag::from(unsafe { utf8!(flag) }),
+        user: User::new(user_id),
     })
 }
 
@@ -258,9 +254,9 @@ pub extern "stdcall" fn on_add_group_request(sub_type: i32, send_time: i32, grou
         canceld: false,
         sub_type: sub_type,
         send_time: send_time,
-        msg: utf8!(msg),
-        flag: Flag::from(utf8!(flag)),
+        msg: unsafe { utf8!(msg) },
+        flag: Flag::from(unsafe { utf8!(flag) }),
         group: Group::new(group_id),
-        user: User::new(user_id)
+        user: User::new(user_id),
     })
 }
diff --git a/src/listener.rs b/src/listener.rs
@@ -7,7 +7,7 @@ use super::events::{Event, Events};
 use crate::cqp::{EVENT_IGNORE, EVENT_BLOCK};
 
 lazy_static! {
-    static ref listeners: RwLock<HashMap<Events, fn(E: &mut Event)>> = RwLock::new(HashMap::new());
+    static ref listeners: RwLock<HashMap<Events, fn(E: &mut dyn Event)>> = RwLock::new(HashMap::new());
 }
 
 pub fn register_listener<E>(event_type: Events, callback: fn(&mut E)) where E: Event {
diff --git a/src/qqtargets.rs b/src/qqtargets.rs
@@ -4,18 +4,16 @@ use std::ops::Add;
 
 use byteorder::{BigEndian, ReadBytesExt};
 
-use encoding::{EncoderTrap, DecoderTrap, Encoding};
+use encoding::{DecoderTrap, Encoding};
 use encoding::all::GB18030;
 
-use crate::api::{send_private_msg, get_stranger_info, add_log, CQLogLevel, get_group_member_list, get_group_member_info_v2, get_group_info, send_group_msg, set_group_anonymous_ban, Flag, set_group_card, set_group_anonymous, set_group_whole_ban, set_group_ban, set_group_kick};
+use crate::api::{send_private_msg, get_stranger_info, get_group_member_list, get_group_member_info_v2, get_group_info, send_group_msg, set_group_anonymous_ban, Flag, set_group_card, set_group_anonymous, set_group_whole_ban, set_group_ban, set_group_kick};
 
 macro_rules! utf8 {
     ($b:expr) => {
-        unsafe {
-            GB18030
-                .decode($b, DecoderTrap::Ignore).unwrap()[..]
-                .to_string()
-        }
+        GB18030
+            .decode($b, DecoderTrap::Ignore).unwrap()[..]
+            .to_string()
     }
 }
 
@@ -25,7 +23,7 @@ pub(crate) fn read_multi_object(b: Vec<u8>) -> Vec<Vec<u8>> {
     let mut vs = Vec::new();
     for _ in 0..count {
         let mut v = vec![0u8; b.read_i16::<BigEndian>().unwrap() as usize];
-        b.read_exact(&mut v);
+        b.read_exact(&mut v).unwrap();
         vs.push(v);
     }
     vs
@@ -36,8 +34,8 @@ pub trait ReadString: Read {
         let len = self.read_i16::<BigEndian>()?;
         if len > 0 {
             let mut v = vec![0u8; len as usize];
-            self.read_exact(&mut v);
-            Ok(utf8!(v.as_slice()))
+            self.read_exact(&mut v).unwrap();
+            Ok(unsafe { utf8!(v.as_slice()) })
         } else { Ok(String::new()) }
     }
 }
@@ -49,7 +47,7 @@ pub struct File {
     pub id: String,
     pub name: String,
     pub size: i64,
-    pub busid: i64
+    pub busid: i64,
 }
 
 impl File {
@@ -59,7 +57,7 @@ impl File {
             id: b.read_string().unwrap(),
             name: b.read_string().unwrap(),
             size: b.read_i64::<BigEndian>().unwrap(),
-            busid: b.read_i64::<BigEndian>().unwrap()
+            busid: b.read_i64::<BigEndian>().unwrap(),
         }
     }
 }
@@ -69,11 +67,10 @@ pub struct Anonymous {
     pub group_id: i64,
     pub user_id: i64,
     pub name: String,
-    pub flag: Flag
+    pub flag: Flag,
 }
 
 impl Anonymous {
-
     pub fn ban(&self, time: i64) {
         set_group_anonymous_ban(self.group_id, self.flag.clone(), time);
     }
@@ -84,7 +81,7 @@ impl Anonymous {
             group_id: group_id,
             user_id: c.read_i64::<BigEndian>().unwrap(),
             name: c.read_string().unwrap(),
-            flag: unsafe { String::from_utf8_unchecked(b)}
+            flag: unsafe { String::from_utf8_unchecked(b) },
         }
     }
 }
@@ -185,7 +182,6 @@ impl Message for Group {
 }
 
 impl Group {
-
     pub fn new(group_id: i64) -> Group {
         get_group_info(group_id, false)
     }
@@ -303,14 +299,7 @@ impl User {
         let mut b = Cursor::new(base64::decode(&b).unwrap());
         User {
             user_id: b.read_i64::<BigEndian>().unwrap(),
-            nickname: {
-                let len = b.read_i16::<BigEndian>().unwrap();
-                if len > 0 {
-                    let mut v = vec![0; len as usize];
-                    b.read_exact(&mut v);
-                    utf8!(v.as_slice())
-                } else { String::new() }
-            },
+            nickname: b.read_string().unwrap(),
             sex: UserSex::from(b.read_i32::<BigEndian>().unwrap()),
             age: b.read_i32::<BigEndian>().unwrap(),
         }
@@ -358,10 +347,9 @@ pub trait Message {
         self.send_message(cqcode::music_custom(url, audio, title, content, image).as_str())
     }
 
-    fn send_share(&self, url: &str,  title: &str, content: &str, image: &str) {
+    fn send_share(&self, url: &str, title: &str, content: &str, image: &str) {
         self.send_message(cqcode::share(url, title, content, image).as_str())
     }
-
 }
 
 pub mod cqcode {
@@ -381,7 +369,7 @@ pub mod cqcode {
         //发送base64编码的图片。"JXU2MThCJXU4QkY0JXU4QkREJXVGRjBDJXU1NDNCJXU2MjEx"
         Base64(String),
         //发送二进制图片。"很明显，这个没办法演示给你看"
-        Binary(Vec<u8>)
+        Binary(Vec<u8>),
     }
 
     impl Image {
@@ -392,28 +380,28 @@ pub mod cqcode {
                 Image::Default(s) => s.clone(),
                 Image::File(s) => {
                     let filename = Path::new(s).file_name().unwrap();
-                    fs::copy(s, data_dir.join(Path::new(filename)));
+                    fs::copy(s, data_dir.join(Path::new(filename))).unwrap();
                     filename.to_str().unwrap().to_string()
-                },
+                }
                 Image::Binary(b) => {
                     let filename = format!("{}.jpg", uuid::Uuid::new_v4());
                     let mut f = fs::File::create(Path::new(data_dir).join(&filename)).unwrap();
-                    f.write_all(b);
-                    f.flush();
+                    f.write_all(b).unwrap();
+                    f.flush().unwrap();
                     filename
-                },
+                }
                 Image::Base64(s) => {
                     let filename = format!("{}.jpg", uuid::Uuid::new_v4());
                     let mut f = fs::File::create(Path::new(data_dir).join(&filename)).unwrap();
-                    f.write_all(base64::decode(s.as_bytes()).unwrap().as_slice());
-                    f.flush();
+                    f.write_all(base64::decode(s.as_bytes()).unwrap().as_slice()).unwrap();
+                    f.flush().unwrap();
                     filename
-                },
+                }
                 Image::Http(s) => {
                     let filename = format!("{}.jpg", uuid::Uuid::new_v4());
                     let mut f = fs::File::create(Path::new(data_dir).join(&filename)).unwrap();
-                    f.write_all(reqwest::get(s.as_str()).unwrap().text().unwrap().as_bytes());
-                    f.flush();
+                    f.write_all(reqwest::get(s.as_str()).unwrap().text().unwrap().as_bytes()).unwrap();
+                    f.flush().unwrap();
                     filename
                 }
             }
@@ -491,8 +479,7 @@ pub mod cqcode {
         format!("[CQ:music,type=custom,url={url},audio={audio},title={title},content={content},image={image}]", url = url, audio = audio, title = title, content = content, image = image)
     }
 
-    pub fn share(url: &str,  title: &str, content: &str, image: &str) -> String {
-        format!("[CQ:share,url={url},title={title},content={content},image={image}]", url= url, title = title, content = content, image = image)
+    pub fn share(url: &str, title: &str, content: &str, image: &str) -> String {
+        format!("[CQ:share,url={url},title={title},content={content},image={image}]", url = url, title = title, content = content, image = image)
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ pub struct DiscussMessageEvent {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`impl DiscussMessageEvent {`
`15`		`- fn get_user() {}`
	`15`	`+ pub fn get_user() {}`
`16`	`16`	`//fn get_discuss() {} qq已经放弃讨论组，所以讨论组方面的东西就不写了。`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use super::events::{Event, Events};`
`7`	`7`	`use crate::cqp::{EVENT_IGNORE, EVENT_BLOCK};`
`8`	`8`
`9`	`9`	`lazy_static! {`
`10`		`- static ref listeners: RwLock<HashMap<Events, fn(E: &mut Event)>> = RwLock::new(HashMap::new());`
	`10`	`+ static ref listeners: RwLock<HashMap<Events, fn(E: &mut dyn Event)>> = RwLock::new(HashMap::new());`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`pub fn register_listener<E>(event_type: Events, callback: fn(&mut E)) where E: Event {`