chore: clippy warnings

This commit is contained in:
Paul Makles
2023-01-03 21:06:43 +00:00
parent 27b4699299
commit c5b823ad13
9 changed files with 12 additions and 12 deletions

View File

@@ -22,7 +22,7 @@ pub async fn req(
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
session.subscription = Some(data.into_inner()); session.subscription = Some(data.into_inner());
session session
.save(&rauth) .save(rauth)
.await .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
.map_err(|_| Error::DatabaseError { .map_err(|_| Error::DatabaseError {

View File

@@ -13,7 +13,7 @@ use rocket::State;
pub async fn req(rauth: &State<RAuth>, mut session: Session) -> Result<EmptyResponse> { pub async fn req(rauth: &State<RAuth>, mut session: Session) -> Result<EmptyResponse> {
session.subscription = None; session.subscription = None;
session session
.save(&rauth) .save(rauth)
.await .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
.map_err(|_| Error::DatabaseError { .map_err(|_| Error::DatabaseError {

View File

@@ -161,7 +161,7 @@ pub struct PartialChannel {
} }
/// Optional fields on channel object /// Optional fields on channel object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
pub enum FieldsChannel { pub enum FieldsChannel {
Description, Description,
Icon, Icon,

View File

@@ -134,7 +134,7 @@ pub struct Server {
} }
/// Optional fields on server object /// Optional fields on server object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
pub enum FieldsServer { pub enum FieldsServer {
Description, Description,
Categories, Categories,
@@ -144,7 +144,7 @@ pub enum FieldsServer {
} }
/// Optional fields on server object /// Optional fields on server object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
pub enum FieldsRole { pub enum FieldsRole {
Colour, Colour,
} }

View File

@@ -42,7 +42,7 @@ pub struct Member {
} }
/// Optional fields on server member object /// Optional fields on server member object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
pub enum FieldsMember { pub enum FieldsMember {
Nickname, Nickname,
Avatar, Avatar,

View File

@@ -56,7 +56,7 @@ pub struct Bot {
} }
/// Optional fields on bot object /// Optional fields on bot object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq)]
pub enum FieldsBot { pub enum FieldsBot {
Token, Token,
InteractionsURL, InteractionsURL,

View File

@@ -10,7 +10,7 @@ pub fn if_false(t: &bool) -> bool {
} }
/// User's relationship with another user (or themselves) /// User's relationship with another user (or themselves)
#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
pub enum RelationshipStatus { pub enum RelationshipStatus {
None, None,
User, User,
@@ -30,7 +30,7 @@ pub struct Relationship {
} }
/// Presence status /// Presence status
#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
pub enum Presence { pub enum Presence {
/// User is online /// User is online
Online, Online,
@@ -163,7 +163,7 @@ pub struct User {
} }
/// Optional fields on user object /// Optional fields on user object
#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] #[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
pub enum FieldsUser { pub enum FieldsUser {
Avatar, Avatar,
StatusText, StatusText,

View File

@@ -147,7 +147,7 @@ pub async fn presence_clear_region(region_id: Option<&str>) {
// also send out any relevant events. // also send out any relevant events.
for session in sessions { for session in sessions {
let parts = session.split(':').collect::<Vec<&str>>(); let parts = session.split(':').collect::<Vec<&str>>();
if let (Some(user_id), Some(session_id)) = (parts.get(0), parts.get(1)) { if let (Some(user_id), Some(session_id)) = (parts.first(), parts.get(1)) {
if let Ok(session_id) = session_id.parse() { if let Ok(session_id) = session_id.parse() {
presence_delete_session_internal(user_id, session_id, true).await; presence_delete_session_internal(user_id, session_id, true).await;
} }

View File

@@ -53,5 +53,5 @@ pub async fn __get_set_sessions(conn: &mut Conn, region_id: &str) -> Vec<String>
/// Delete region session set /// Delete region session set
pub async fn __delete_set_sessions(conn: &mut Conn, region_id: &str) { pub async fn __delete_set_sessions(conn: &mut Conn, region_id: &str) {
let _: () = conn.del(region_id).await.unwrap(); conn.del::<_, ()>(region_id).await.unwrap();
} }