From c8399685ff776a08799c5e4c6eecd6fef1dce7bd Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Sun, 3 Mar 2024 01:59:05 +0200 Subject: [PATCH] Fix target #[cfg]s --- Cargo.toml | 4 ++-- src/lib.rs | 1 + src/util.rs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index adb8cc61..3570285b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,10 @@ authors = ["Mark Poliakov "] core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" } compiler_builtins = { version = "0.1", optional = true } + [target.'cfg(unix)'.dependencies] libc = { version = "0.2.140", default-features = false } - -[target.'cfg(target_os = "yggdrasil")'.dependencies] +[target.'cfg(not(unix))'.dependencies] yggdrasil-rt = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-rt.git", default-features = false } [features] diff --git a/src/lib.rs b/src/lib.rs index a00521a4..7eb56561 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ generic_const_exprs, arbitrary_self_types, strict_provenance, + exposed_provenance, let_chains, test, allocator_api diff --git a/src/util.rs b/src/util.rs index 93e3a17d..3e97c1b3 100644 --- a/src/util.rs +++ b/src/util.rs @@ -49,7 +49,7 @@ pub fn map_pages(count: usize) -> Option> { NonNull::new(address as *mut u8) } - #[cfg(target_os = "yggdrasil")] + #[cfg(not(unix))] { use yggdrasil_rt::mem::MappingSource; @@ -67,7 +67,7 @@ pub fn unmap_pages(address: NonNull, count: usize) { unsafe { libc::munmap(address.as_ptr() as _, count * PAGE_SIZE); } - #[cfg(target_os = "yggdrasil")] + #[cfg(not(unix))] { unsafe { yggdrasil_rt::sys::unmap_memory(address.addr().into(), count * PAGE_SIZE).unwrap();