lasers/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/dani-garcia/bitwarden_rs synced 2024-11-22 01:48:09 +01:00
Code Issues Projects Releases Wiki Activity

Fix compiling for Windows targets (#5053)

Browse Source 
The `unix::signal` was also included during Windows compilations.
This of course will not work. Fix this by only including it for `unix` targets.

Also changed all other conditional compilation options to use `cfg(unix)` instead of `cfg(not(windows))`.
The latter may also include `wasm` for example, or any other future target family.
This way we will only match `unix`

Fixes #5052
This commit is contained in:
Mathijs van Veluw 2024-10-06 13:49:00 +02:00 committed by GitHub
parent 040e2a7bb0
commit f0efec7c96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -34,7 +34,7 @@ query_logger = ["dep:diesel_logger"]
# Currently only used to enable rusts official ip support # Currently only used to enable rusts official ip support
unstable = [] unstable = []
[target."cfg(not(windows))".dependencies] [target."cfg(unix)".dependencies]
# Logging # Logging
syslog = "6.1.1" syslog = "6.1.1"

10
src/main.rs
View File

@ -38,9 +38,11 @@ use std::{
use tokio::{ use tokio::{
fs::File, fs::File,
io::{AsyncBufReadExt, BufReader}, io::{AsyncBufReadExt, BufReader},
signal::unix::SignalKind,
}; };
#[cfg(unix)]
use tokio::signal::unix::SignalKind;
#[macro_use] #[macro_use]
mod error; mod error;
mod api; mod api;
@ -383,7 +385,7 @@ fn init_logging() -> Result<log::LevelFilter, Error> {
{ {
logger = logger.chain(fern::log_file(log_file)?); logger = logger.chain(fern::log_file(log_file)?);
} }
#[cfg(not(windows))] #[cfg(unix)]
{ {
const SIGHUP: i32 = SignalKind::hangup().as_raw_value(); const SIGHUP: i32 = SignalKind::hangup().as_raw_value();
let path = Path::new(&log_file); let path = Path::new(&log_file);
@ -391,7 +393,7 @@ fn init_logging() -> Result<log::LevelFilter, Error> {
} }
} }
#[cfg(not(windows))] #[cfg(unix)]
{ {
if cfg!(feature = "enable_syslog") || CONFIG.use_syslog() { if cfg!(feature = "enable_syslog") || CONFIG.use_syslog() {
logger = chain_syslog(logger); logger = chain_syslog(logger);
@ -441,7 +443,7 @@ fn init_logging() -> Result<log::LevelFilter, Error> {
Ok(level) Ok(level)
} }
#[cfg(not(windows))] #[cfg(unix)]
fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch { fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch {
let syslog_fmt = syslog::Formatter3164 { let syslog_fmt = syslog::Formatter3164 {
facility: syslog::Facility::LOG_USER, facility: syslog::Facility::LOG_USER,