Skip to content

Commit e6c9949

Browse files
authored
Merge pull request #7 from ameknite/replace-mach
Mach is deprecated, update to mach2
2 parents e3087e4 + cdc753d commit e6c9949

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ edition = "2018"
1717
[badges]
1818
maintenance = { status = "passively-maintained" }
1919

20-
[target.'cfg(all(any(target_os = "macos", target_os = "ios"), not(feature = "unix_sysv")))'.dependencies.mach]
21-
version = "0.3"
20+
[target.'cfg(all(any(target_os = "macos", target_os = "ios"), not(feature = "unix_sysv")))'.dependencies.mach2]
21+
version = "0.4.1"
2222
default-features = false
2323

2424
[target.'cfg(target_os = "windows")'.dependencies.winapi]

rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
max_width = 79
2-
fn_args_layout = "Compressed"
2+
fn_params_layout = "Compressed"

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ extern crate core;
151151
any(target_os = "macos", target_os = "ios"),
152152
not(feature = "unix_sysv")
153153
))]
154-
extern crate mach;
154+
extern crate mach2 as mach;
155155

156156
#[cfg(unix)]
157157
extern crate libc;

src/mirrored/macos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use super::mem;
66

7-
use mach;
87
use mach::boolean::boolean_t;
98
use mach::kern_return::*;
109
use mach::mach_types::mem_entry_name_port_t;
@@ -20,6 +19,7 @@ use mach::vm_inherit::VM_INHERIT_NONE;
2019
use mach::vm_prot::{vm_prot_t, VM_PROT_READ, VM_PROT_WRITE};
2120
use mach::vm_statistics::{VM_FLAGS_ANYWHERE, VM_FLAGS_FIXED};
2221
use mach::vm_types::mach_vm_address_t;
22+
use mach2 as mach;
2323

2424
use super::AllocError;
2525

0 commit comments

Comments
 (0)