Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unrequired cfg any directive #1364

Merged
merged 1 commit into from
May 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conmon-rs/server/src/oom_watcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ use tokio_eventfd::EventFd;
use tokio_util::sync::CancellationToken;
use tracing::{debug, debug_span, error, trace, Instrument};

#[cfg(any(all(target_os = "linux", target_env = "musl")))]
#[cfg(all(target_os = "linux", target_env = "musl"))]
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC as u64);
#[cfg(any(all(target_os = "linux", target_arch = "s390x", not(target_env = "musl"))))]
#[cfg(all(target_os = "linux", target_arch = "s390x", not(target_env = "musl")))]
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC as u32);
#[cfg(any(
all(target_os = "linux", target_arch = "arm", not(target_env = "musl")),
all(target_os = "linux", target_arch = "x86")
))]
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC as i32);
#[cfg(any(all(
#[cfg(all(
target_os = "linux",
not(target_arch = "s390x"),
not(target_arch = "arm"),
not(target_arch = "x86"),
not(target_env = "musl")
)))]
))]
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC);

static CGROUP_ROOT: &str = "/sys/fs/cgroup";
Expand Down