Merge remote-tracking branch 'origin/main' into use-curr-dir

bytebeamio · Jul 28, 2023 · b38c9c3 · b38c9c3
2 parents 7a4cb75 + 8c12bb7
commit b38c9c3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/uplink/src/base/mod.rs b/uplink/src/base/mod.rs
@@ -5,9 +5,9 @@ use std::{collections::HashMap, fmt::Debug};
 
 use serde::{Deserialize, Serialize};
 
-#[cfg(any(target_os = "linux"))]
+#[cfg(target_os = "linux")]
 use crate::collector::journalctl::JournalCtlConfig;
-#[cfg(any(target_os = "android"))]
+#[cfg(target_os = "android")]
 use crate::collector::logcat::LogcatConfig;
 
 use self::bridge::stream::MAX_BUFFER_SIZE;
@@ -233,8 +233,8 @@ pub struct Config {
     pub action_redirections: HashMap<String, String>,
     #[serde(default)]
     pub ignore_actions_if_no_clients: bool,
-    #[cfg(any(target_os = "linux"))]
+    #[cfg(target_os = "linux")]
     pub logging: Option<JournalCtlConfig>,
-    #[cfg(any(target_os = "android"))]
+    #[cfg(target_os = "android")]
     pub logging: Option<LogcatConfig>,
 }