From 488bd7f62b8d4b068dc73b10650da66ad97363e8 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 27 Jun 2022 10:15:00 +0200 Subject: [PATCH] lint --- warpgate-db-entities/src/KnownHost.rs | 2 +- warpgate-db-entities/src/LogEntry.rs | 2 +- warpgate-db-entities/src/Recording.rs | 4 ++-- warpgate-db-entities/src/Session.rs | 2 +- warpgate-db-entities/src/Ticket.rs | 2 +- warpgate-db-migrations/src/m00001_create_ticket.rs | 2 +- warpgate-db-migrations/src/m00002_create_session.rs | 2 +- warpgate-db-migrations/src/m00003_create_recording.rs | 4 ++-- warpgate-db-migrations/src/m00004_create_known_host.rs | 2 +- warpgate-db-migrations/src/m00005_create_log_entry.rs | 2 +- warpgate-protocol-ssh/src/client/mod.rs | 4 ++-- warpgate-protocol-ssh/src/server/session.rs | 2 +- warpgate-protocol-ssh/src/server/session_handle.rs | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/warpgate-db-entities/src/KnownHost.rs b/warpgate-db-entities/src/KnownHost.rs index 3008949..1a57376 100644 --- a/warpgate-db-entities/src/KnownHost.rs +++ b/warpgate-db-entities/src/KnownHost.rs @@ -3,7 +3,7 @@ use sea_orm::entity::prelude::*; use serde::Serialize; use uuid::Uuid; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Object, Serialize)] +#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Object, Serialize)] #[sea_orm(table_name = "known_hosts")] #[oai(rename = "SSHKnownHost")] pub struct Model { diff --git a/warpgate-db-entities/src/LogEntry.rs b/warpgate-db-entities/src/LogEntry.rs index 116c973..db0998c 100644 --- a/warpgate-db-entities/src/LogEntry.rs +++ b/warpgate-db-entities/src/LogEntry.rs @@ -5,7 +5,7 @@ use sea_orm::query::JsonValue; use serde::Serialize; use uuid::Uuid; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] +#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)] #[sea_orm(table_name = "log")] #[oai(rename = "LogEntry")] pub struct Model { diff --git a/warpgate-db-entities/src/Recording.rs b/warpgate-db-entities/src/Recording.rs index 2b7cacd..b38ef46 100644 --- a/warpgate-db-entities/src/Recording.rs +++ b/warpgate-db-entities/src/Recording.rs @@ -5,7 +5,7 @@ use sea_orm::sea_query::ForeignKeyAction; use serde::Serialize; use uuid::Uuid; -#[derive(Debug, Clone, PartialEq, EnumIter, Enum, DeriveActiveEnum, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq, EnumIter, Enum, DeriveActiveEnum, Serialize)] #[sea_orm(rs_type = "String", db_type = "String(Some(16))")] pub enum RecordingKind { #[sea_orm(string_value = "terminal")] @@ -14,7 +14,7 @@ pub enum RecordingKind { Traffic, } -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] +#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)] #[sea_orm(table_name = "recordings")] #[oai(rename = "Recording")] pub struct Model { diff --git a/warpgate-db-entities/src/Session.rs b/warpgate-db-entities/src/Session.rs index 2983508..3f7f7e6 100644 --- a/warpgate-db-entities/src/Session.rs +++ b/warpgate-db-entities/src/Session.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Utc}; use sea_orm::entity::prelude::*; use uuid::Uuid; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] +#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "sessions")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-db-entities/src/Ticket.rs b/warpgate-db-entities/src/Ticket.rs index fe45ece..da4d482 100644 --- a/warpgate-db-entities/src/Ticket.rs +++ b/warpgate-db-entities/src/Ticket.rs @@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*; use serde::Serialize; use uuid::Uuid; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] +#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)] #[sea_orm(table_name = "tickets")] #[oai(rename = "Ticket")] pub struct Model { diff --git a/warpgate-db-migrations/src/m00001_create_ticket.rs b/warpgate-db-migrations/src/m00001_create_ticket.rs index 15e4e54..2beac1a 100644 --- a/warpgate-db-migrations/src/m00001_create_ticket.rs +++ b/warpgate-db-migrations/src/m00001_create_ticket.rs @@ -5,7 +5,7 @@ pub mod ticket { use sea_orm::entity::prelude::*; use uuid::Uuid; - #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] + #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "tickets")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-db-migrations/src/m00002_create_session.rs b/warpgate-db-migrations/src/m00002_create_session.rs index 963df8c..b36a9c3 100644 --- a/warpgate-db-migrations/src/m00002_create_session.rs +++ b/warpgate-db-migrations/src/m00002_create_session.rs @@ -6,7 +6,7 @@ pub mod session { use sea_orm::entity::prelude::*; use uuid::Uuid; - #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] + #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "sessions")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-db-migrations/src/m00003_create_recording.rs b/warpgate-db-migrations/src/m00003_create_recording.rs index a4a9fc7..c3f8eef 100644 --- a/warpgate-db-migrations/src/m00003_create_recording.rs +++ b/warpgate-db-migrations/src/m00003_create_recording.rs @@ -6,7 +6,7 @@ pub mod recording { use sea_orm::entity::prelude::*; use uuid::Uuid; - #[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum)] + #[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)] #[sea_orm(rs_type = "String", db_type = "String(Some(16))")] pub enum RecordingKind { #[sea_orm(string_value = "terminal")] @@ -15,7 +15,7 @@ pub mod recording { Traffic, } - #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] + #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "recordings")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-db-migrations/src/m00004_create_known_host.rs b/warpgate-db-migrations/src/m00004_create_known_host.rs index df50bf8..0eccb76 100644 --- a/warpgate-db-migrations/src/m00004_create_known_host.rs +++ b/warpgate-db-migrations/src/m00004_create_known_host.rs @@ -5,7 +5,7 @@ pub mod known_host { use sea_orm::entity::prelude::*; use uuid::Uuid; - #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] + #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "known_hosts")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-db-migrations/src/m00005_create_log_entry.rs b/warpgate-db-migrations/src/m00005_create_log_entry.rs index 3f30bfa..8216b2a 100644 --- a/warpgate-db-migrations/src/m00005_create_log_entry.rs +++ b/warpgate-db-migrations/src/m00005_create_log_entry.rs @@ -7,7 +7,7 @@ pub mod log_entry { use sea_orm::query::JsonValue; use uuid::Uuid; - #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] + #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] #[sea_orm(table_name = "log")] pub struct Model { #[sea_orm(primary_key, auto_increment = false)] diff --git a/warpgate-protocol-ssh/src/client/mod.rs b/warpgate-protocol-ssh/src/client/mod.rs index 48d48c2..13261a9 100644 --- a/warpgate-protocol-ssh/src/client/mod.rs +++ b/warpgate-protocol-ssh/src/client/mod.rs @@ -94,7 +94,7 @@ pub enum RCCommand { Disconnect, } -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub enum RCState { NotInitialized, Connecting, @@ -506,7 +506,7 @@ impl RemoteClient { impl Drop for RemoteClient { fn drop(&mut self) { for task in self.child_tasks.drain(..) { - let _ = task.abort(); + task.abort(); } info!("Closed connection"); debug!("Dropped"); diff --git a/warpgate-protocol-ssh/src/server/session.rs b/warpgate-protocol-ssh/src/server/session.rs index cdfc0c7..2847600 100644 --- a/warpgate-protocol-ssh/src/server/session.rs +++ b/warpgate-protocol-ssh/src/server/session.rs @@ -294,7 +294,7 @@ impl ServerSession { SessionHandleCommand::Close => { let _ = self.emit_service_message("Session closed by admin").await; info!("Session closed by admin"); - let _ = self.request_disconnect().await; + self.request_disconnect().await; self.disconnect_server().await; } } diff --git a/warpgate-protocol-ssh/src/server/session_handle.rs b/warpgate-protocol-ssh/src/server/session_handle.rs index 99d4d54..935672a 100644 --- a/warpgate-protocol-ssh/src/server/session_handle.rs +++ b/warpgate-protocol-ssh/src/server/session_handle.rs @@ -1,7 +1,7 @@ use tokio::sync::mpsc; use warpgate_common::SessionHandle; -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub enum SessionHandleCommand { Close, }