diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index f7385f2..d63dd02 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -1,9 +1,9 @@ -use auth::{auth_prelogin, BrowserAuthenticator}; +use auth::{BrowserAuthenticator, auth_prelogin}; use clap::Parser; use common::constants::GP_USER_AGENT; use gpapi::{ auth::{SamlAuthData, SamlAuthResult}, - clap::{args::Os, handle_error, Args, InfoLevelVerbosity}, + clap::{Args, InfoLevelVerbosity, args::Os, handle_error}, gp_params::{ClientOs, GpParams}, utils::{normalize_server, openssl}, }; diff --git a/apps/gpservice/src/cli.rs b/apps/gpservice/src/cli.rs index 40987f4..54e6ff7 100644 --- a/apps/gpservice/src/cli.rs +++ b/apps/gpservice/src/cli.rs @@ -159,7 +159,7 @@ mod signals { pub async fn handle_signals(vpn_ctx: Arc, ws_ctx: Arc) { use gpapi::service::event::WsEvent; - use tokio::signal::unix::{signal, Signal, SignalKind}; + use tokio::signal::unix::{Signal, SignalKind, signal}; let (mut user_sig1, mut user_sig2) = match || -> anyhow::Result<(Signal, Signal)> { let user_sig1 = signal(SignalKind::user_defined1())?; diff --git a/apps/gpservice/src/handlers.rs b/apps/gpservice/src/handlers.rs index 2dd1bcf..38064b5 100644 --- a/apps/gpservice/src/handlers.rs +++ b/apps/gpservice/src/handlers.rs @@ -11,8 +11,8 @@ use anyhow::bail; use axum::{ body::Bytes, extract::{ - ws::{self, CloseFrame, Message, Utf8Bytes, WebSocket}, State, WebSocketUpgrade, + ws::{self, CloseFrame, Message, Utf8Bytes, WebSocket}, }, http::StatusCode, response::IntoResponse, diff --git a/apps/gpservice/src/routes.rs b/apps/gpservice/src/routes.rs index 53e7087..5c71053 100644 --- a/apps/gpservice/src/routes.rs +++ b/apps/gpservice/src/routes.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use axum::{ - routing::{get, post}, Router, + routing::{get, post}, }; use crate::{handlers, ws_server::WsServerContext}; diff --git a/apps/gpservice/src/ws_server.rs b/apps/gpservice/src/ws_server.rs index b39a3fd..36d0e66 100644 --- a/apps/gpservice/src/ws_server.rs +++ b/apps/gpservice/src/ws_server.rs @@ -11,7 +11,7 @@ use openconnect::{find_csd_wrapper, find_vpnc_script}; use serde::de::DeserializeOwned; use tokio::{ net::TcpListener, - sync::{mpsc, watch, RwLock}, + sync::{RwLock, mpsc, watch}, }; use tokio_util::sync::CancellationToken; diff --git a/crates/auth/src/lib.rs b/crates/auth/src/lib.rs index 165da6d..439062e 100644 --- a/crates/auth/src/lib.rs +++ b/crates/auth/src/lib.rs @@ -1,7 +1,7 @@ use anyhow::bail; use gpapi::{ gp_params::GpParams, - portal::{prelogin, Prelogin}, + portal::{Prelogin, prelogin}, }; #[cfg(feature = "browser-auth")] diff --git a/crates/auth/src/webview/auth_messenger.rs b/crates/auth/src/webview/auth_messenger.rs index 5d70f41..7df8cb3 100644 --- a/crates/auth/src/webview/auth_messenger.rs +++ b/crates/auth/src/webview/auth_messenger.rs @@ -2,7 +2,7 @@ use anyhow::bail; use gpapi::{auth::SamlAuthData, error::AuthDataParseError}; use log::{error, info}; use regex::Regex; -use tokio::sync::{mpsc, RwLock}; +use tokio::sync::{RwLock, mpsc}; use tokio_util::sync::CancellationToken; #[derive(Debug)] diff --git a/crates/auth/src/webview/macos.rs b/crates/auth/src/webview/macos.rs index 1c70697..b130be7 100644 --- a/crates/auth/src/webview/macos.rs +++ b/crates/auth/src/webview/macos.rs @@ -1,7 +1,7 @@ use block2::RcBlock; use log::warn; use objc2::runtime::AnyObject; -use objc2_foundation::{NSError, NSString, NSURLRequest, NSURL}; +use objc2_foundation::{NSError, NSString, NSURL, NSURLRequest}; use objc2_web_kit::WKWebView; use tauri::webview::PlatformWebview; diff --git a/crates/auth/src/webview/unix.rs b/crates/auth/src/webview/unix.rs index 31af707..9c8c5ce 100644 --- a/crates/auth/src/webview/unix.rs +++ b/crates/auth/src/webview/unix.rs @@ -5,8 +5,8 @@ use gpapi::utils::redact::redact_uri; use log::warn; use tauri::webview::PlatformWebview; use webkit2gtk::{ - gio::Cancellable, glib::GString, LoadEvent, TLSErrorsPolicy, URIResponseExt, WebResource, WebResourceExt, WebViewExt, - WebsiteDataManagerExt, + LoadEvent, TLSErrorsPolicy, URIResponseExt, WebResource, WebResourceExt, WebViewExt, WebsiteDataManagerExt, + gio::Cancellable, glib::GString, }; use super::{ diff --git a/crates/auth/src/webview/webview_auth.rs b/crates/auth/src/webview/webview_auth.rs index 67570dd..7780b70 100644 --- a/crates/auth/src/webview/webview_auth.rs +++ b/crates/auth/src/webview/webview_auth.rs @@ -4,8 +4,8 @@ use anyhow::bail; use gpapi::{auth::SamlAuthData, gp_params::GpParams, utils::redact::redact_uri}; use log::{info, warn}; use tauri::{ - webview::{PageLoadEvent, PageLoadPayload}, AppHandle, WebviewUrl, WebviewWindow, WindowEvent, + webview::{PageLoadEvent, PageLoadPayload}, }; use tokio::{sync::oneshot, time}; diff --git a/crates/gpapi/src/clap/args.rs b/crates/gpapi/src/clap/args.rs index 4ee0829..58631c5 100644 --- a/crates/gpapi/src/clap/args.rs +++ b/crates/gpapi/src/clap/args.rs @@ -1,4 +1,4 @@ -use clap::{builder::PossibleValue, ValueEnum}; +use clap::{ValueEnum, builder::PossibleValue}; use crate::gp_params::ClientOs; diff --git a/crates/gpapi/src/gateway/mod.rs b/crates/gpapi/src/gateway/mod.rs index b768269..77d3670 100644 --- a/crates/gpapi/src/gateway/mod.rs +++ b/crates/gpapi/src/gateway/mod.rs @@ -1,6 +1,6 @@ +pub mod hip; mod login; mod parse_gateways; -pub mod hip; pub use login::*; pub(crate) use parse_gateways::*; diff --git a/crates/gpapi/src/logger.rs b/crates/gpapi/src/logger.rs index fa7b49f..e287d5f 100644 --- a/crates/gpapi/src/logger.rs +++ b/crates/gpapi/src/logger.rs @@ -2,7 +2,7 @@ use std::sync::OnceLock; use anyhow::bail; use env_logger::Logger; -use log::{warn, Level}; +use log::{Level, warn}; use log_reload::{ReloadHandle, ReloadLog}; static LOG_HANDLE: OnceLock>> = OnceLock::new(); diff --git a/crates/gpapi/src/utils/base64.rs b/crates/gpapi/src/utils/base64.rs index d3bc064..0aa23ea 100644 --- a/crates/gpapi/src/utils/base64.rs +++ b/crates/gpapi/src/utils/base64.rs @@ -1,4 +1,4 @@ -use base64::{engine::general_purpose, Engine}; +use base64::{Engine, engine::general_purpose}; pub fn encode(data: &[u8]) -> String { let engine = general_purpose::STANDARD; diff --git a/crates/gpapi/src/utils/crypto.rs b/crates/gpapi/src/utils/crypto.rs index b69e5c5..e27d8ed 100644 --- a/crates/gpapi/src/utils/crypto.rs +++ b/crates/gpapi/src/utils/crypto.rs @@ -1,8 +1,8 @@ use chacha20poly1305::{ - aead::{Aead, OsRng}, AeadCore, ChaCha20Poly1305, Key, KeyInit, + aead::{Aead, OsRng}, }; -use serde::{de::DeserializeOwned, Serialize}; +use serde::{Serialize, de::DeserializeOwned}; pub fn generate_key() -> Key { ChaCha20Poly1305::generate_key(&mut OsRng) diff --git a/crates/gpapi/src/utils/openssl.rs b/crates/gpapi/src/utils/openssl.rs index fbae86d..56a1adb 100644 --- a/crates/gpapi/src/utils/openssl.rs +++ b/crates/gpapi/src/utils/openssl.rs @@ -3,7 +3,7 @@ use std::path::Path; use log::{info, warn}; use regex::Regex; use tempfile::NamedTempFile; -use version_compare::{compare_to, Cmp}; +use version_compare::{Cmp, compare_to}; pub fn openssl_conf() -> String { let option = get_openssl_option(); diff --git a/crates/gpapi/src/utils/redact.rs b/crates/gpapi/src/utils/redact.rs index 59fdd54..1864a2e 100644 --- a/crates/gpapi/src/utils/redact.rs +++ b/crates/gpapi/src/utils/redact.rs @@ -2,7 +2,7 @@ use std::sync::RwLock; use redact_engine::{Pattern, Redaction as RedactEngine}; use regex::Regex; -use url::{form_urlencoded, Url}; +use url::{Url, form_urlencoded}; pub struct Redaction { redact_engine: RwLock>, diff --git a/crates/gpapi/src/utils/window.rs b/crates/gpapi/src/utils/window.rs index 36246ab..1d3d9e2 100644 --- a/crates/gpapi/src/utils/window.rs +++ b/crates/gpapi/src/utils/window.rs @@ -23,9 +23,9 @@ mod unix { use anyhow::bail; use gtk::{ + EventBox, glib::Cast, traits::{EventBoxExt, GtkWindowExt, WidgetExt}, - EventBox, }; use log::info; use tauri::WebviewWindow;