Fix some MacOS related warnings

Signed-off-by: Eloi DEMOLIS <eloi.demolis@clever-cloud.com>
sozu-proxy · Jun 14, 2023 · 0b435b6 · 0b435b6
1 parent a93f66e
commit 0b435b6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/bin/src/main.rs b/bin/src/main.rs
@@ -54,7 +54,9 @@ mod util;
 /// Start and restart the worker UNIX processes
 mod worker;
 
-use anyhow::{bail, Context};
+#[cfg(target_os = "linux")]
+use anyhow::bail;
+use anyhow::Context;
 use cli::Args;
 #[cfg(target_os = "linux")]
 use libc::{cpu_set_t, pid_t};

diff --git a/bin/src/worker.rs b/bin/src/worker.rs
@@ -1,15 +1,3 @@
-#[cfg(target_os = "freebsd")]
-use std::ffi::c_void;
-#[cfg(target_os = "macos")]
-use std::ffi::CString;
-#[cfg(target_os = "macos")]
-use std::iter::repeat;
-#[cfg(target_os = "freebsd")]
-use std::iter::repeat;
-#[cfg(target_os = "freebsd")]
-use std::mem::size_of;
-#[cfg(target_os = "macos")]
-use std::ptr::null_mut;
 use std::{
     collections::VecDeque,
     fmt,
@@ -19,12 +7,16 @@ use std::{
     os::unix::process::CommandExt,
     process::Command,
 };
+#[cfg(target_os = "freebsd")]
+use std::{ffi::c_void, iter::repeat, mem::size_of};
 
-use anyhow::{bail, Context};
+#[cfg(target_os = "linux")]
+use anyhow::bail;
+use anyhow::Context;
 use futures::SinkExt;
-use libc::{self, pid_t};
 #[cfg(target_os = "macos")]
-use libc::{c_char, PATH_MAX};
+use libc::c_char;
+use libc::{self, pid_t};
 #[cfg(target_os = "freebsd")]
 use libc::{sysctl, CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, PATH_MAX};
 use mio::net::UnixStream;
@@ -421,7 +413,8 @@ extern "C" {
 
 #[cfg(target_os = "macos")]
 pub unsafe fn get_executable_path() -> anyhow::Result<String> {
-    let path = std::env::current_exe().with_context(|| "failed to retrieve current executable path")?;
+    let path =
+        std::env::current_exe().with_context(|| "failed to retrieve current executable path")?;
     Ok(path.to_string_lossy().to_string())
 }
 

diff --git a/lib/src/metrics/writer.rs b/lib/src/metrics/writer.rs
@@ -1,11 +1,16 @@
 #[cfg(target_env = "musl")]
 use std::mem;
 use std::{
-    io::{self, Error, ErrorKind, Write},
+    io::{self, Write},
     net::SocketAddr,
+};
+#[cfg(target_os = "linux")]
+use std::{
+    io::{Error, ErrorKind},
     os::unix::io::AsRawFd,
 };
 
+#[cfg(target_os = "linux")]
 use libc::{c_uint, c_void, iovec, msghdr};
 use mio::net::UdpSocket;