bumped rust

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "warpgate-web",
 ]
 default-members = ["warpgate"]
+resolver = "2"
 
 [profile.release]
 lto = true

rust-toolchain

@@ -1 +1 @@
-nightly-2023-01-11
+nightly-2023-11-28

warpgate-admin/src/api/roles.rs

@@ -133,9 +133,7 @@ impl DetailApi {
             .map_err(poem::error::InternalServerError)?;
 
         Ok(match role {
-            Some(role) => GetRoleResponse::Ok(Json(
-                role.try_into().map_err(poem::error::InternalServerError)?,
-            )),
+            Some(role) => GetRoleResponse::Ok(Json(role.into())),
             None => GetRoleResponse::NotFound,
         })
     }
@@ -152,7 +150,8 @@ impl DetailApi {
         let Some(role) = Role::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
+            .map_err(poem::error::InternalServerError)?
+        else {
             return Ok(UpdateRoleResponse::NotFound);
         };
 
@@ -181,7 +180,8 @@ impl DetailApi {
         let Some(role) = Role::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
+            .map_err(poem::error::InternalServerError)?
+        else {
             return Ok(DeleteRoleResponse::NotFound);
         };
 

warpgate-common/src/eventhub.rs

@@ -19,9 +19,7 @@ impl<E> Clone for EventSender<E> {
 impl<E> EventSender<E> {
     async fn cleanup_subscriptions(&self) -> MutexGuard<'_, SubscriptionStoreInner<E>> {
         let mut subscriptions = self.subscriptions.lock().await;
-        subscriptions
-            .drain_filter(|(_, ref s)| s.is_closed())
-            .for_each(drop);
+        subscriptions.retain(|(_, ref s)| !s.is_closed());
         subscriptions
     }
 }

warpgate-common/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(drain_filter, duration_constants)]
+#![feature(duration_constants)]
 pub mod auth;
 mod config;
 pub mod consts;
@@ -12,5 +12,4 @@ mod types;
 pub use config::*;
 pub use error::WarpgateError;
 pub use tls::*;
-pub use try_macro::*;
 pub use types::*;

warpgate-core/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(drain_filter, duration_constants, try_blocks)]
+#![feature(duration_constants, try_blocks)]
 pub mod consts;
 mod data;
 mod state;

warpgate-core/src/logging/database.rs

@@ -57,10 +57,7 @@ fn values_to_log_entry_data(mut values: SerializedRecordValues) -> Option<LogEnt
     let message = (*values).remove("message").unwrap_or_default();
 
     use sea_orm::ActiveValue::Set;
-    let session_id = session_id.and_then(|x| Uuid::parse_str(&x).ok());
-    let Some(session_id) = session_id else {
-            return None
-        };
+    let session_id = session_id.and_then(|x| Uuid::parse_str(&x).ok())?;
 
     Some(LogEntry::ActiveModel {
         id: Set(Uuid::new_v4()),

warpgate-core/src/recordings/terminal.rs

@@ -19,19 +19,14 @@ pub enum AsciiCast {
     Output(f32, String, String),
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 pub enum TerminalRecordingStreamId {
     Input,
+    #[default]
     Output,
     Error,
 }
 
-impl Default for TerminalRecordingStreamId {
-    fn default() -> Self {
-        TerminalRecordingStreamId::Output
-    }
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(untagged)]
 pub enum TerminalRecordingItem {

warpgate-protocol-http/src/proxy.rs

@@ -136,7 +136,7 @@ fn copy_client_response<R: SomeResponse>(
             }
         }
     }
-    server_response.headers_mut().extend(headers.into_iter());
+    server_response.headers_mut().extend(headers);
 
     server_response.set_status(client_response.status());
 }

warpgate-protocol-ssh/src/lib.rs

@@ -20,8 +20,6 @@ use uuid::Uuid;
 use warpgate_common::{ProtocolName, SshHostKeyVerificationMode, Target, TargetOptions};
 use warpgate_core::{ProtocolServer, Services, TargetTestError};
 
-use crate::client::{RCCommand, RemoteClient};
-
 pub static PROTOCOL_NAME: ProtocolName = "SSH";
 
 #[derive(Clone)]
@@ -48,7 +46,9 @@ impl ProtocolServer for SSHProtocolServer {
 
     async fn test_target(&self, target: Target) -> Result<(), TargetTestError> {
         let TargetOptions::Ssh(ssh_options) = target.options else {
-            return Err(TargetTestError::Misconfigured("Not an SSH target".to_owned()));
+            return Err(TargetTestError::Misconfigured(
+                "Not an SSH target".to_owned(),
+            ));
         };
 
         let mut handles = RemoteClient::create(Uuid::new_v4(), self.services.clone())?;