Skip to content

Commit d0a562c

Browse files
committed
Restore Cargo.toml; fix merge issue
Desired changes were removed in the Cargo.toml reversion commit. They are restored now. A few `mod` statements are moved outside of the Windows-only block.
1 parent 7327209 commit d0a562c

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

crates/devolutions-pedm/Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ anyhow = "1.0"
1414
axum = { version = "0.8", default-features = false, features = ["http1", "json", "tokio", "query", "tracing", "tower-log", "form", "original-uri", "matched-path"] }
1515
base16ct = { version = "0.2", features = ["std", "alloc"] }
1616
base64 = "0.22"
17+
chrono = { version = "0.4", features = ["serde"] }
1718
digest = "0.10"
1819
hyper = { version = "1.3", features = ["server"] }
1920
hyper-util = { version = "0.1", features = ["tokio"] }
20-
schemars = "0.8"
21+
schemars = { version = "0.8", features = ["chrono"] }
2122
serde = "1.0"
2223
serde_json = "1.0"
2324
sha1 = "0.10"
@@ -39,10 +40,10 @@ uuid = "1"
3940
dunce = "1.0"
4041
tower = "0.5"
4142
futures-util = "0.3"
42-
libsql = { version = "0.9", optional = true, features = [ "core", "stream"] }
43-
tokio-postgres = { version = "0.7", optional = true }
44-
bb8 = { version = "0.9.0", optional = true }
45-
bb8-postgres = { version = "0.9.0", optional = true }
43+
libsql = { version = "0.9", optional = true, default-features = false, features = [ "core", "sync"] }
44+
tokio-postgres = { version = "0.7", optional = true, features = ["with-chrono-0_4"] }
45+
bb8 = { version = "0.9", optional = true }
46+
bb8-postgres = { version = "0.9", optional = true }
4647

4748
[features]
4849
default = ["libsql"]

crates/devolutions-pedm/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
use async_trait::async_trait;
22
use camino::Utf8PathBuf;
33

4+
use devolutions_gateway_task::{ShutdownSignal, Task};
5+
6+
mod config;
7+
mod db;
48
pub mod model;
59

610
pub use config::Config;
7-
use devolutions_gateway_task::{ShutdownSignal, Task};
811

912
cfg_if::cfg_if! {
1013
if #[cfg(target_os = "windows")] {
1114
pub mod api;
12-
mod db;
13-
mod config;
1415
mod elevations;
1516
mod elevator;
1617
mod error;

0 commit comments

Comments
 (0)