Actual merge of master that builds

This fixes some random clippy warnings in master.

Author: allan2

crates/devolutions-pedm/src/api/launch.rs

@@ -1,10 +1,8 @@
 use std::path::{Path, PathBuf};
-use std::sync::Arc;
 
 use aide::NoApi;
 use axum::extract::State;
 use axum::{Extension, Json};
-use parking_lot::RwLock;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::info;
@@ -20,10 +18,8 @@ use win_api_wrappers::token::Token;
 use win_api_wrappers::utils::{environment_block, expand_environment_path, CommandLine, WideString};
 
 use crate::api::state::AppState;
-use crate::db::DbHandle;
 use crate::elevator;
 use crate::error::Error;
-use crate::policy::Policy;
 
 use super::NamedPipeConnectInfo;
 

crates/devolutions-pedm/src/api/mod.rs

@@ -178,24 +178,17 @@ pub async fn serve(config: Config, shutdown_signal: ShutdownSignal) -> Result<()
     let db = Db::new(&config).await?;
     db.setup().await?;
 
-<<<<<<< HEAD
-    // Update the list of accounts in the database.
+    let (db_handle, db_async_bridge_task) = DbAsyncBridgeTask::new(db.clone());
+    let _db_async_bridge_task = devolutions_gateway_task::spawn_task(db_async_bridge_task, shutdown_signal);
 
-    // SAFETY: uses `NetUserEnum` and `LookupAccountNameW` from `windows`
+    // Get the system's accounts and update if needed.
     let accounts = list_accounts()?;
-
     let db_accounts = db.get_accounts().await?;
     info!("Accounts retrieved successfully");
     let diff = diff_accounts(&db_accounts, &accounts);
     db.update_accounts(&diff).await?;
 
-    let state = AppState::new(db, &config.pipe_name).await?;
-=======
-    let (db_handle, db_async_bridge_task) = DbAsyncBridgeTask::new(db.clone());
-    let _db_async_bridge_task = devolutions_gateway_task::spawn_task(db_async_bridge_task, shutdown_signal);
-
     let state = AppState::new(db, db_handle, &config.pipe_name).await?;
->>>>>>> origin/master
 
     // a plain Axum router
     let hello_router = Router::new().route("/health", axum::routing::get(health_check));

crates/devolutions-pedm/src/db/libsql.rs

@@ -8,16 +8,11 @@ use std::ops::Deref;
 
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-<<<<<<< HEAD
+use devolutions_pedm_shared::policy::ElevationResult;
 use futures_util::{StreamExt, TryStreamExt};
 use libsql::params::IntoParams;
 use libsql::{params, Row, Value};
 use tracing::info;
-=======
-use devolutions_pedm_shared::policy::ElevationResult;
-use libsql::params::IntoParams;
-use libsql::{params, Row};
->>>>>>> origin/master
 
 use crate::account::{AccountWithId, AccountsDiff, DomainId, Sid};
 

crates/devolutions-pedm/src/db/mod.rs

@@ -273,7 +273,7 @@ pub(crate) struct DbAsyncBridgeTask {
 }
 
 impl DbAsyncBridgeTask {
-    pub fn new(db: Db) -> (DbHandle, Self) {
+    pub(crate) fn new(db: Db) -> (DbHandle, Self) {
         let (tx, rx) = tokio::sync::mpsc::channel(8);
         (DbHandle { tx }, Self { db, rx })
     }

crates/devolutions-pedm/src/db/pg.rs

@@ -9,13 +9,8 @@ use async_trait::async_trait;
 use bb8::Pool;
 use bb8_postgres::PostgresConnectionManager;
 use chrono::{DateTime, Utc};
-<<<<<<< HEAD
-use futures_util::try_join;
-use tokio_postgres::types::ToSql;
-=======
 use devolutions_pedm_shared::policy::ElevationResult;
->>>>>>> origin/master
-use tokio_postgres::NoTls;
+use tokio_postgres::{types::ToSql, NoTls};
 
 use crate::account::{AccountWithId, AccountsDiff, DomainId, Sid};