Skip to content

Commit

Permalink
Merge pull request #1461 from madsmtm/objc2-core-foundation
Browse files Browse the repository at this point in the history
Use `objc2-core-foundation`
  • Loading branch information
GuillaumeGomez authored Jan 27, 2025
2 parents cd87377 + 0370948 commit 64f2157
Show file tree
Hide file tree
Showing 11 changed files with 254 additions and 453 deletions.
20 changes: 19 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ component = [
"windows/Win32_System_Rpc",
"windows/Win32_System_Variant",
"windows/Win32_System_Wmi",
"objc2-core-foundation/CFArray",
"objc2-core-foundation/CFBase",
"objc2-core-foundation/CFDictionary",
"objc2-core-foundation/CFNumber",
"objc2-core-foundation/CFString",
]
disk = [
"windows/Win32_Foundation",
Expand All @@ -32,6 +37,13 @@ disk = [
"windows/Win32_System_Ioctl",
"windows/Win32_System_SystemServices",
"windows/Win32_System_WindowsProgramming",
"objc2-core-foundation/CFArray",
"objc2-core-foundation/CFBase",
"objc2-core-foundation/CFDictionary",
"objc2-core-foundation/CFError",
"objc2-core-foundation/CFNumber",
"objc2-core-foundation/CFString",
"objc2-core-foundation/CFURL",
]
system = [
"windows/Win32_Foundation",
Expand All @@ -54,6 +66,10 @@ system = [
"windows/Win32_UI_Shell",
"dep:ntapi",
"dep:memchr",
"objc2-core-foundation/CFBase",
"objc2-core-foundation/CFData",
"objc2-core-foundation/CFDictionary",
"objc2-core-foundation/CFString",
]
network = [
"windows/Win32_Foundation",
Expand Down Expand Up @@ -107,7 +123,9 @@ windows = { version = ">=0.54, <=0.57", optional = true }
libc = "^0.2.164"

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
core-foundation-sys = "0.8.7"
objc2-core-foundation = { version = "0.3.0", optional = true, default-features = false, features = [
"std",
] }

[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dev-dependencies]
tempfile = "3.9"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ mod test {
}
}

#[cfg(feature = "system")]
#[cfg(all(feature = "system", feature = "user"))]
#[test]
fn check_all_process_uids_resolvable() {
// On linux, some user IDs don't have an associated user (no idea why though).
Expand Down
Loading

0 comments on commit 64f2157

Please sign in to comment.