Merge pull request #7 from ameknite/replace-mach

Mach is deprecated, update to mach2
LiquidityC · Nov 13, 2023 · e6c9949 · e6c9949
2 parents e3087e4 + cdc753d
commit e6c9949
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,8 +17,8 @@ edition = "2018"
 [badges]
 maintenance = { status = "passively-maintained" }
 
-[target.'cfg(all(any(target_os = "macos", target_os = "ios"), not(feature = "unix_sysv")))'.dependencies.mach]
-version = "0.3"
+[target.'cfg(all(any(target_os = "macos", target_os = "ios"), not(feature = "unix_sysv")))'.dependencies.mach2]
+version = "0.4.1"
 default-features = false
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,2 +1,2 @@
 max_width = 79
-fn_args_layout = "Compressed"
+fn_params_layout = "Compressed"
diff --git a/src/lib.rs b/src/lib.rs
@@ -151,7 +151,7 @@ extern crate core;
     any(target_os = "macos", target_os = "ios"),
     not(feature = "unix_sysv")
 ))]
-extern crate mach;
+extern crate mach2 as mach;
 
 #[cfg(unix)]
 extern crate libc;

diff --git a/src/mirrored/macos.rs b/src/mirrored/macos.rs
@@ -4,7 +4,6 @@
 
 use super::mem;
 
-use mach;
 use mach::boolean::boolean_t;
 use mach::kern_return::*;
 use mach::mach_types::mem_entry_name_port_t;
@@ -20,6 +19,7 @@ use mach::vm_inherit::VM_INHERIT_NONE;
 use mach::vm_prot::{vm_prot_t, VM_PROT_READ, VM_PROT_WRITE};
 use mach::vm_statistics::{VM_FLAGS_ANYWHERE, VM_FLAGS_FIXED};
 use mach::vm_types::mach_vm_address_t;
+use mach2 as mach;
 
 use super::AllocError;